Bump webmock from 3.24.0 to 3.25.0 #721
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![dependabot[bot]](https://avatars.githubusercontent.com/in/29110?s=60&v=4){kind=small}
Bumps [webmock](https://github.com/bblimke/webmock) from 3.24.0 to 3.25.0. - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](bblimke/webmock@v3.24.0...v3.25.0) --- updated-dependencies: - dependency-name: webmock dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
gem compare hashdiff 1.1.1 1.1.2Compared versions: ["1.1.1", "1.1.2"]
DIFFERENT date:
1.1.1: 2024-08-02 00:00:00 UTC
1.1.2: 2024-11-12 00:00:00 UTC
DIFFERENT version:
1.1.1: 1.1.1
1.1.2: 1.1.2
DIFFERENT files:
1.1.1->1.1.2:
* Changed:
changelog.md +6/-0
lib/hashdiff/version.rb +1/-1 |
gem compare --diff hashdiff 1.1.1 1.1.2Compared versions: ["1.1.1", "1.1.2"]
DIFFERENT files:
1.1.1->1.1.2:
* Changed:
changelog.md
--- /tmp/d20250207-2049-t47kzl/hashdiff-1.1.1/changelog.md 2025-02-07 03:36:02.349562014 +0000
+++ /tmp/d20250207-2049-t47kzl/hashdiff-1.1.2/changelog.md 2025-02-07 03:36:02.352562010 +0000
@@ -2,0 +3,6 @@
+## v1.1.2 2024-11-12
+
+* Fix bundler cache #96 (@olleolleolle)
+* Quote the '3.0' in YAML #95 (@olleolleolle)
+* Fix version in source code #97 (@liufengyun)
+
lib/hashdiff/version.rb
--- /tmp/d20250207-2049-t47kzl/hashdiff-1.1.1/lib/hashdiff/version.rb 2025-02-07 03:36:02.351562012 +0000
+++ /tmp/d20250207-2049-t47kzl/hashdiff-1.1.2/lib/hashdiff/version.rb 2025-02-07 03:36:02.354562008 +0000
@@ -4 +4 @@
- VERSION = '1.1.1'.freeze
+ VERSION = '1.1.2'.freeze |
gem compare rexml 3.3.9 3.4.0Compared versions: ["3.3.9", "3.4.0"]
DIFFERENT date:
3.3.9: 2024-10-24 00:00:00 UTC
3.4.0: 2024-12-15 00:00:00 UTC
DIFFERENT metadata:
3.3.9: {"changelog_uri" => "https://github.com/ruby/rexml/releases/tag/v3.3.9"}
3.4.0: {"changelog_uri" => "https://github.com/ruby/rexml/releases/tag/v3.4.0"}
DIFFERENT rubygems_version:
3.3.9: 3.6.0.dev
3.4.0: 3.5.22
DIFFERENT version:
3.3.9: 3.3.9
3.4.0: 3.4.0
DIFFERENT files:
3.3.9->3.4.0:
* Changed:
NEWS.md +29/-0
lib/rexml/parsers/baseparser.rb +46/-42
lib/rexml/parsers/pullparser.rb +4/-0
lib/rexml/rexml.rb +1/-1
lib/rexml/source.rb +39/-4
lib/rexml/text.rb +15/-40
DIFFERENT extra_rdoc_files:
3.3.9->3.4.0:
* Changed:
NEWS.md +29/-0 |
gem compare --diff rexml 3.3.9 3.4.0Compared versions: ["3.3.9", "3.4.0"]
DIFFERENT files:
3.3.9->3.4.0:
* Changed:
NEWS.md
--- /tmp/d20250207-2509-7qrajq/rexml-3.3.9/NEWS.md 2025-02-07 03:36:23.482534508 +0000
+++ /tmp/d20250207-2509-7qrajq/rexml-3.4.0/NEWS.md 2025-02-07 03:36:23.494534477 +0000
@@ -2,0 +3,29 @@
+## 3.4.0 - 2024-12-15 {#version-3-4-0}
+
+### Improvement
+
+ * Improved performance.
+ * GH-216
+ * Patch by NAITOH Jun
+
+ * JRuby: Improved parse performance.
+ * GH-219
+ * Patch by João Duarte
+
+ * Added support for reusing pull parser.
+ * GH-214
+ * GH-220
+ * Patch by Dmitry Pogrebnoy
+
+ * Improved error handling when source is `IO`.
+ * GH-221
+ * Patch by NAITOH Jun
+
+### Thanks
+
+ * NAITOH Jun
+
+ * João Duarte
+
+ * Dmitry Pogrebnoy
+
lib/rexml/parsers/baseparser.rb
--- /tmp/d20250207-2509-7qrajq/rexml-3.3.9/lib/rexml/parsers/baseparser.rb 2025-02-07 03:36:23.490534487 +0000
+++ /tmp/d20250207-2509-7qrajq/rexml-3.4.0/lib/rexml/parsers/baseparser.rb 2025-02-07 03:36:23.501534459 +0000
@@ -183,0 +184,4 @@
+ reset
+ end
+
+ def reset
@@ -272 +276 @@
- if @source.match("<?", true)
+ if @source.match?("<?", true)
@@ -274,2 +278,2 @@
- elsif @source.match("<!", true)
- if @source.match("--", true)
+ elsif @source.match?("<!", true)
+ if @source.match?("--", true)
@@ -284 +288 @@
- elsif @source.match("DOCTYPE", true)
+ elsif @source.match?("DOCTYPE", true)
@@ -286,2 +290,2 @@
- unless @source.match(/\s+/um, true)
- if @source.match(">")
+ unless @source.match?(/\s+/um, true)
+ if @source.match?(">")
@@ -296 +300 @@
- if @source.match(/\s*\[/um, true)
+ if @source.match?(/\s*\[/um, true)
@@ -299 +303 @@
- elsif @source.match(/\s*>/um, true)
+ elsif @source.match?(/\s*>/um, true)
@@ -311 +315 @@
- if @source.match(/\s*\[/um, true)
+ if @source.match?(/\s*\[/um, true)
@@ -313 +317 @@
- elsif @source.match(/\s*>/um, true)
+ elsif @source.match?(/\s*>/um, true)
@@ -323 +327 @@
- @source.match(/\s*/um, true)
+ @source.match?(/\s*/um, true)
@@ -334 +338 @@
- @source.match(/\s*/um, true) # skip spaces
+ @source.match?(/\s*/um, true) # skip spaces
@@ -336,2 +340,2 @@
- if @source.match("<!", true)
- if @source.match("ELEMENT", true)
+ if @source.match?("<!", true)
+ if @source.match?("ELEMENT", true)
@@ -341 +345 @@
- elsif @source.match("ENTITY", true)
+ elsif @source.match?("ENTITY", true)
@@ -373 +377 @@
- elsif @source.match("ATTLIST", true)
+ elsif @source.match?("ATTLIST", true)
@@ -393 +397 @@
- elsif @source.match("NOTATION", true)
+ elsif @source.match?("NOTATION", true)
@@ -395,2 +399,2 @@
- unless @source.match(/\s+/um, true)
- if @source.match(">")
+ unless @source.match?(/\s+/um, true)
+ if @source.match?(">")
@@ -408 +412 @@
- unless @source.match(/\s*>/um, true)
+ unless @source.match?(/\s*>/um, true)
@@ -422 +426 @@
- elsif @source.match(/\]\s*>/um, true)
+ elsif @source.match?(/\]\s*>/um, true)
@@ -431 +435 @@
- @source.match(/\s*/um, true)
+ @source.match?(/\s*/um, true)
@@ -435 +439 @@
- if @source.match("<", true)
+ if @source.match?("<", true)
@@ -440 +444 @@
- if @source.match("/", true)
+ if @source.match?("/", true)
@@ -455 +459 @@
- elsif @source.match("!", true)
+ elsif @source.match?("!", true)
@@ -473 +477 @@
- elsif @source.match("?", true)
+ elsif @source.match?("?", true)
@@ -654 +658 @@
- if @source.match(/\S/um)
+ if @source.match?(/\S/um)
@@ -696,2 +700,2 @@
- if (accept_external_id or accept_public_id) and @source.match(/#{public}/um)
- if @source.match(/#{public}(?:\s+[^'"]|\s*[\[>])/um)
+ if (accept_external_id or accept_public_id) and @source.match?(/#{public}/um)
+ if @source.match?(/#{public}(?:\s+[^'"]|\s*[\[>])/um)
@@ -700 +704 @@
- unless @source.match(/#{public}\s+#{PUBIDLITERAL}/um)
+ unless @source.match?(/#{public}\s+#{PUBIDLITERAL}/um)
@@ -704 +708 @@
- if @source.match(/#{public}\s+#{PUBIDLITERAL}\s+[^'"]/um)
+ if @source.match?(/#{public}\s+#{PUBIDLITERAL}\s+[^'"]/um)
@@ -707 +711 @@
- unless @source.match(/#{public}\s+#{PUBIDLITERAL}\s+#{SYSTEMLITERAL}/um)
+ unless @source.match?(/#{public}\s+#{PUBIDLITERAL}\s+#{SYSTEMLITERAL}/um)
@@ -714,2 +718,2 @@
- elsif accept_external_id and @source.match(/#{system}/um)
- if @source.match(/#{system}(?:\s+[^'"]|\s*[\[>])/um)
+ elsif accept_external_id and @source.match?(/#{system}/um)
+ if @source.match?(/#{system}(?:\s+[^'"]|\s*[\[>])/um)
@@ -718 +722 @@
- unless @source.match(/#{system}\s+#{SYSTEMLITERAL}/um)
+ unless @source.match?(/#{system}\s+#{SYSTEMLITERAL}/um)
@@ -723 +727 @@
- unless @source.match(/\A\s*(?:PUBLIC|SYSTEM)\s/um)
+ unless @source.match?(/\A\s*(?:PUBLIC|SYSTEM)\s/um)
@@ -732 +736 @@
- if @source.match(/\s+/um, true)
+ if @source.match?(/\s+/um, true)
@@ -740 +744 @@
- unless @source.match("?>", true)
+ unless @source.match?("?>", true)
@@ -770 +774 @@
- if @source.match(">", true)
+ if @source.match?(">", true)
@@ -772 +776 @@
- elsif @source.match("/>", true)
+ elsif @source.match?("/>", true)
@@ -780 +784 @@
- unless @source.match(/\s*=\s*/um, true)
+ unless @source.match?(/\s*=\s*/um, true)
@@ -796 +800 @@
- @source.match(/\s*/um, true)
+ @source.match?(/\s*/um, true)
lib/rexml/parsers/pullparser.rb
--- /tmp/d20250207-2509-7qrajq/rexml-3.3.9/lib/rexml/parsers/pullparser.rb 2025-02-07 03:36:23.490534487 +0000
+++ /tmp/d20250207-2509-7qrajq/rexml-3.4.0/lib/rexml/parsers/pullparser.rb 2025-02-07 03:36:23.501534459 +0000
@@ -95,0 +96,4 @@
+
+ def reset
+ @parser.reset
+ end
lib/rexml/rexml.rb
--- /tmp/d20250207-2509-7qrajq/rexml-3.3.9/lib/rexml/rexml.rb 2025-02-07 03:36:23.491534485 +0000
+++ /tmp/d20250207-2509-7qrajq/rexml-3.4.0/lib/rexml/rexml.rb 2025-02-07 03:36:23.502534457 +0000
@@ -34 +34 @@
- VERSION = "3.3.9"
+ VERSION = "3.4.0"
lib/rexml/source.rb
--- /tmp/d20250207-2509-7qrajq/rexml-3.3.9/lib/rexml/source.rb 2025-02-07 03:36:23.492534482 +0000
+++ /tmp/d20250207-2509-7qrajq/rexml-3.4.0/lib/rexml/source.rb 2025-02-07 03:36:23.503534454 +0000
@@ -3,0 +4 @@
+require "stringio"
@@ -20,0 +22,10 @@
+
+ def match?(pattern)
+ pattern = /#{Regexp.escape(pattern)}/ if pattern.is_a?(String)
+ super(pattern)
+ end
+
+ def skip(pattern)
+ pattern = /#{Regexp.escape(pattern)}/ if pattern.is_a?(String)
+ super(pattern)
+ end
@@ -38 +48,0 @@
- require 'stringio'
@@ -80 +90 @@
- @term_encord = {}
+ @encoded_terms = {}
@@ -128,0 +139,8 @@
+ def match?(pattern, cons=false)
+ if cons
+ !@scanner.skip(pattern).nil?
+ else
+ !@scanner.match?(pattern).nil?
+ end
+ end
+
@@ -231 +249 @@
- term = @term_encord[term] ||= encode(term)
+ term = @encoded_terms[term] ||= encode(term)
@@ -269,0 +288,17 @@
+ def match?( pattern, cons=false )
+ # To avoid performance issue, we need to increase bytes to read per scan
+ min_bytes = 1
+ while true
+ if cons
+ n_matched_bytes = @scanner.skip(pattern)
+ else
+ n_matched_bytes = @scanner.match?(pattern)
+ end
+ return true if n_matched_bytes
+ return false if pattern.is_a?(String)
+ return false if @source.nil?
+ return false unless read(nil, min_bytes)
+ min_bytes *= 2
+ end
+ end
+
@@ -289 +324 @@
- rescue IOError
+ rescue IOError, SystemCallError
lib/rexml/text.rb
--- /tmp/d20250207-2509-7qrajq/rexml-3.3.9/lib/rexml/text.rb 2025-02-07 03:36:23.492534482 +0000
+++ /tmp/d20250207-2509-7qrajq/rexml-3.4.0/lib/rexml/text.rb 2025-02-07 03:36:23.503534454 +0000
@@ -32,25 +32,10 @@
- if String.method_defined? :encode
- VALID_XML_CHARS = Regexp.new('^['+
- VALID_CHAR.map { |item|
- case item
- when Integer
- [item].pack('U').force_encoding('utf-8')
- when Range
- [item.first, '-'.ord, item.last].pack('UUU').force_encoding('utf-8')
- end
- }.join +
- ']*$')
- else
- VALID_XML_CHARS = /^(
- [\x09\x0A\x0D\x20-\x7E] # ASCII
- | [\xC2-\xDF][\x80-\xBF] # non-overlong 2-byte
- | \xE0[\xA0-\xBF][\x80-\xBF] # excluding overlongs
- | [\xE1-\xEC\xEE][\x80-\xBF]{2} # straight 3-byte
- | \xEF[\x80-\xBE]{2} #
- | \xEF\xBF[\x80-\xBD] # excluding U+fffe and U+ffff
- | \xED[\x80-\x9F][\x80-\xBF] # excluding surrogates
- | \xF0[\x90-\xBF][\x80-\xBF]{2} # planes 1-3
- | [\xF1-\xF3][\x80-\xBF]{3} # planes 4-15
- | \xF4[\x80-\x8F][\x80-\xBF]{2} # plane 16
- )*$/nx;
- end
+ VALID_XML_CHARS = Regexp.new('^['+
+ VALID_CHAR.map { |item|
+ case item
+ when Integer
+ [item].pack('U').force_encoding('utf-8')
+ when Range
+ [item.first, '-'.ord, item.last].pack('UUU').force_encoding('utf-8')
+ end
+ }.join +
+ ']*$')
@@ -135,15 +120,5 @@
- if String.method_defined? :encode
- string.chars.each do |c|
- case c.ord
- when *VALID_CHAR
- else
- raise "Illegal character #{c.inspect} in raw string #{string.inspect}"
- end
- end
- else
- string.scan(/[\x00-\x7F]|[\x80-\xBF][\xC0-\xF0]*|[\xC0-\xF0]/n) do |c|
- case c.unpack('U')
- when *VALID_CHAR
- else
- raise "Illegal character #{c.inspect} in raw string #{string.inspect}"
- end
+ string.chars.each do |c|
+ case c.ord
+ when *VALID_CHAR
+ else
+ raise "Illegal character #{c.inspect} in raw string #{string.inspect}" |
gem compare webmock 3.24.0 3.25.0Compared versions: ["3.24.0", "3.25.0"]
DIFFERENT date:
3.24.0: 2024-09-30 00:00:00 UTC
3.25.0: 2025-02-06 00:00:00 UTC
DIFFERENT metadata:
3.24.0: {"bug_tracker_uri" => "https://github.com/bblimke/webmock/issues", "changelog_uri" => "https://github.com/bblimke/webmock/blob/v3.24.0/CHANGELOG.md", "documentation_uri" => "https://www.rubydoc.info/gems/webmock/3.24.0", "source_code_uri" => "https://github.com/bblimke/webmock/tree/v3.24.0", "wiki_uri" => "https://github.com/bblimke/webmock/wiki"}
3.25.0: {"bug_tracker_uri" => "https://github.com/bblimke/webmock/issues", "changelog_uri" => "https://github.com/bblimke/webmock/blob/v3.25.0/CHANGELOG.md", "documentation_uri" => "https://www.rubydoc.info/gems/webmock/3.25.0", "source_code_uri" => "https://github.com/bblimke/webmock/tree/v3.25.0", "wiki_uri" => "https://github.com/bblimke/webmock/wiki"}
DIFFERENT rubygems_version:
3.24.0: 3.5.16
3.25.0: 3.7.0.dev
DIFFERENT version:
3.24.0: 3.24.0
3.25.0: 3.25.0
DIFFERENT files:
3.24.0->3.25.0:
* Changed:
CHANGELOG.md +6/-0
README.md +1/-0
lib/webmock/http_lib_adapters/net_http.rb +18/-4
lib/webmock/version.rb +1/-1 |
gem compare --diff webmock 3.24.0 3.25.0Compared versions: ["3.24.0", "3.25.0"]
DIFFERENT files:
3.24.0->3.25.0:
* Changed:
CHANGELOG.md
--- /tmp/d20250207-3077-3gakqo/webmock-3.24.0/CHANGELOG.md 2025-02-07 03:36:45.062489397 +0000
+++ /tmp/d20250207-3077-3gakqo/webmock-3.25.0/CHANGELOG.md 2025-02-07 03:36:45.072489380 +0000
@@ -2,0 +3,6 @@
+# 3.25.0
+
+* Resolve net-http adapter deprecation Ruby 3.4
+
+ Thanks to [Earlopain](https://github.com/Earlopain)
+
README.md
--- /tmp/d20250207-3077-3gakqo/webmock-3.24.0/README.md 2025-02-07 03:36:45.063489395 +0000
+++ /tmp/d20250207-3077-3gakqo/webmock-3.25.0/README.md 2025-02-07 03:36:45.073489379 +0000
@@ -46,0 +47 @@
+* MRI 3.4
lib/webmock/http_lib_adapters/net_http.rb
--- /tmp/d20250207-3077-3gakqo/webmock-3.24.0/lib/webmock/http_lib_adapters/net_http.rb 2025-02-07 03:36:45.066489390 +0000
+++ /tmp/d20250207-3077-3gakqo/webmock-3.25.0/lib/webmock/http_lib_adapters/net_http.rb 2025-02-07 03:36:45.076489374 +0000
@@ -14,0 +15,2 @@
+ # This will be removed in Ruby 3.5. In Ruby 3.4, const_remove will warn.
+ HAS_LEGACY_CONSTANT = Net.const_defined?(:HTTPSession)
@@ -18 +19,0 @@
- Net.send(:remove_const, :HTTPSession)
@@ -20 +21,4 @@
- Net.send(:const_set, :HTTPSession, @webMockNetHTTP)
+ if HAS_LEGACY_CONSTANT
+ remove_silently(Net, :HTTPSession)
+ Net.send(:const_set, :HTTPSession, @webMockNetHTTP)
+ end
@@ -25 +28,0 @@
- Net.send(:remove_const, :HTTPSession)
@@ -27 +30,4 @@
- Net.send(:const_set, :HTTPSession, OriginalNetHTTP)
+ if HAS_LEGACY_CONSTANT
+ remove_silently(Net, :HTTPSession)
+ Net.send(:const_set, :HTTPSession, OriginalNetHTTP)
+ end
@@ -37,0 +44,8 @@
+ end
+
+ def self.remove_silently(mod, const) #:nodoc:
+ # Don't warn on removing the deprecated constant
+ verbose, $VERBOSE = $VERBOSE, nil
+ mod.send(:remove_const, const)
+ ensure
+ $VERBOSE = verbose
lib/webmock/version.rb
--- /tmp/d20250207-3077-3gakqo/webmock-3.24.0/lib/webmock/version.rb 2025-02-07 03:36:45.071489382 +0000
+++ /tmp/d20250207-3077-3gakqo/webmock-3.25.0/lib/webmock/version.rb 2025-02-07 03:36:45.081489366 +0000
@@ -4 +4 @@
- VERSION = '3.24.0' unless defined?(::WebMock::VERSION)
+ VERSION = '3.25.0' unless defined?(::WebMock::VERSION) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bumps webmock from 3.24.0 to 3.25.0.
Changelog
Sourced from webmock's changelog.
Commits
8384080Version 3.25.0dff6488Merge pull request #1096 from koic/workaround_for_jruby_ci_matrix_is_failing6aacb40Suspend JRuby CI matrixcb65c87Merge pull request #1097 from koic/fix_build_error_in_ruby_3_5_ci_matrix1e7e9dfFix a build error for Ruby 3.5 CI matrixab43ce9Merge pull request #1098 from koic/add_ostruct_to_gemfile3acba79Addostructgem to Gemfile to prevent an error in development with Ruby 3.5d66d1cdMerge pull request #1095 from koic/revert_10917ecd77cRevert "Fix included modules on Ruby 3.4"e8c5129Merge pull request #1091 from sailor/masterDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot mergewill merge this PR after your CI passes on it@dependabot squash and mergewill squash and merge this PR after your CI passes on it@dependabot cancel mergewill cancel a previously requested merge and block automerging@dependabot reopenwill reopen this PR if it is closed@dependabot closewill close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot show <dependency name> ignore conditionswill show all of the ignore conditions of the specified dependency@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)