Bump webmock from 3.25.1 to 3.26.1 #821
Open
Conversation
This file contains hidden or 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
Bumps [webmock](https://github.com/bblimke/webmock) from 3.25.1 to 3.26.1. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](bblimke/webmock@v3.25.1...v3.26.1) --- updated-dependencies: - dependency-name: webmock dependency-version: 3.26.1 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
gem compare bigdecimal 3.2.2 3.3.1Compared versions: ["3.2.2", "3.3.1"]
DIFFERENT require_paths:
3.2.2: ["/opt/hostedtoolcache/Ruby/3.4.7/x64/lib/ruby/gems/3.4.0/extensions/x86_64-linux/3.4.0/bigdecimal-3.2.2", "lib"]
3.3.1: ["/opt/hostedtoolcache/Ruby/3.4.7/x64/lib/ruby/gems/3.4.0/extensions/x86_64-linux/3.4.0/bigdecimal-3.3.1", "lib"]
DIFFERENT version:
3.2.2: 3.2.2
3.3.1: 3.3.1
DIFFERENT files:
3.2.2->3.3.1:
* Changed:
ext/bigdecimal/bigdecimal.c +731/-2254
ext/bigdecimal/bigdecimal.h +4/-25
ext/bigdecimal/bits.h +3/-0
ext/bigdecimal/extconf.rb +3/-7
ext/bigdecimal/missing.h +1/-93
lib/bigdecimal.rb +351/-0
lib/bigdecimal/math.rb +88/-70
lib/bigdecimal/util.rb +15/-14 |
|
gem compare crack 1.0.0 1.0.1Compared versions: ["1.0.0", "1.0.1"]
DIFFERENT date:
1.0.0: 2024-02-09 00:00:00 UTC
1.0.1: 2025-10-22 00:00:00 UTC
DIFFERENT version:
1.0.0: 1.0.0
1.0.1: 1.0.1
DIFFERENT files:
1.0.0->1.0.1:
* Changed:
History +6/-0
lib/crack/version.rb +1/-1
lib/crack/xml.rb +2/-0 |
gem compare --diff crack 1.0.0 1.0.1Compared versions: ["1.0.0", "1.0.1"]
DIFFERENT files:
1.0.0->1.0.1:
* Changed:
History
--- /tmp/d20251031-2402-6vr52s/crack-1.0.0/History 2025-10-31 03:02:14.915634197 +0000
+++ /tmp/d20251031-2402-6vr52s/crack-1.0.1/History 2025-10-31 03:02:14.928634267 +0000
@@ -0,0 +1,6 @@
+== 1.0.1 2025-09-22
+
+* minor patches
+ * Ruby 3.4 support
+ * Handle new "No root element" error from REXML
+
lib/crack/version.rb
--- /tmp/d20251031-2402-6vr52s/crack-1.0.0/lib/crack/version.rb 2025-10-31 03:02:14.922634235 +0000
+++ /tmp/d20251031-2402-6vr52s/crack-1.0.1/lib/crack/version.rb 2025-10-31 03:02:15.063634993 +0000
@@ -2 +2 @@
- VERSION = "1.0.0"
+ VERSION = "1.0.1"
lib/crack/xml.rb
--- /tmp/d20251031-2402-6vr52s/crack-1.0.0/lib/crack/xml.rb 2025-10-31 03:02:14.922634235 +0000
+++ /tmp/d20251031-2402-6vr52s/crack-1.0.1/lib/crack/xml.rb 2025-10-31 03:02:15.064634998 +0000
@@ -234,0 +235,2 @@
+ return {} if xml.strip == ''
+ |
gem compare hashdiff 1.1.2 1.2.1Compared versions: ["1.1.2", "1.2.1"]
DIFFERENT date:
1.1.2: 2024-11-12 00:00:00 UTC
1.2.1: 2025-09-06 00:00:00 UTC
DIFFERENT version:
1.1.2: 1.1.2
1.2.1: 1.2.1
DIFFERENT files:
1.1.2->1.2.1:
* Changed:
.github/workflows/ci.yml +2/-3
Gemfile +1/-1
README.md +26/-1
changelog.md +31/-23
lib/hashdiff/compare_hashes.rb +58/-32
lib/hashdiff/diff.rb +4/-1
lib/hashdiff/version.rb +1/-1 |
gem compare --diff hashdiff 1.1.2 1.2.1Compared versions: ["1.1.2", "1.2.1"]
DIFFERENT files:
1.1.2->1.2.1:
* Changed:
.github/workflows/ci.yml
--- /tmp/d20251031-2564-m9c8pm/hashdiff-1.1.2/.github/workflows/ci.yml 2025-10-31 03:02:37.087754555 +0000
+++ /tmp/d20251031-2564-m9c8pm/hashdiff-1.2.1/.github/workflows/ci.yml 2025-10-31 03:02:37.090754573 +0000
@@ -14 +14 @@
- - 3.0
+ - '3.0'
@@ -25,2 +25 @@
- - name: Install dependencies
- run: bundle install --jobs $(nproc) --retry 3
+ bundler-cache: true # 'bundle install' and cache gems
Gemfile
--- /tmp/d20251031-2564-m9c8pm/hashdiff-1.1.2/Gemfile 2025-10-31 03:02:37.087754555 +0000
+++ /tmp/d20251031-2564-m9c8pm/hashdiff-1.2.1/Gemfile 2025-10-31 03:02:37.091754579 +0000
@@ -3 +3 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
README.md
--- /tmp/d20251031-2564-m9c8pm/hashdiff-1.1.2/README.md 2025-10-31 03:02:37.088754561 +0000
+++ /tmp/d20251031-2564-m9c8pm/hashdiff-1.2.1/README.md 2025-10-31 03:02:37.091754579 +0000
@@ -98 +98,2 @@
-`:indifferent`, `:numeric_tolerance`, `:strip`, `:case_insensitive`, `:array_path` and `:use_lcs`
+`:indifferent`, `:numeric_tolerance`, `:strip`, `:case_insensitive`, `:array_path`,
+`:use_lcs`, and `:preserve_key_order`
@@ -235,0 +237,24 @@
+```
+
+#### `:preserve_key_order`
+
+By default, the change set is ordered by operation type: deletions (-) first, then updates (~), and finally additions (+).
+Within each operation group, keys are sorted alphabetically:
+
+```ruby
+a = {d: 1, c: 1, a: 1}
+b = {d: 2, b: 2, a: 2}
+
+diff = Hashdiff.diff(a, b)
+diff.should == [["-", "c", 1], ["~", "a", 1, 2], ["~", "d", 1, 2], ["+", "b", 2]]
+```
+
+Setting :preserve_key_order to true processes keys in the order they appear in the first hash.
+Keys that only exist in the second hash are appended in their original order:
+
+```ruby
+a = {d: 1, c: 1, a: 1}
+b = {d: 2, b: 2, a: 2}
+
+diff = Hashdiff.diff(a, b, preserve_key_order: true)
+diff.should == [["~", "d", 1, 2], ["-", "c", 1], ["~", "a", 1, 2], ["+", "b", 2]]
changelog.md
--- /tmp/d20251031-2564-m9c8pm/hashdiff-1.1.2/changelog.md 2025-10-31 03:02:37.088754561 +0000
+++ /tmp/d20251031-2564-m9c8pm/hashdiff-1.2.1/changelog.md 2025-10-31 03:02:37.091754579 +0000
@@ -2,0 +3,8 @@
+## v1.2.1 2025-09-06
+
+* Use HTTPS for the source in the Gemfile [#101](https://github.com/liufengyun/hashdiff/issues/101) ([@krzysiek1507](https://github.com/krzysiek1507))
+
+## v1.2.0 2025-5-20
+
+* Added :preserve_key_order option to maintain original hash key order [#99](https://github.com/liufengyun/hashdiff/issues/99) ([@robkiessling](https://github.com/robkiessling))
+
@@ -5,3 +13,3 @@
-* Fix bundler cache #96 (@olleolleolle)
-* Quote the '3.0' in YAML #95 (@olleolleolle)
-* Fix version in source code #97 (@liufengyun)
+* Fix bundler cache [#96](https://github.com/liufengyun/hashdiff/issues/96) ([@olleolleolle](https://github.com/olleolleolle))
+* Quote the '3.0' in YAML [#95](https://github.com/liufengyun/hashdiff/issues/95) ([@olleolleolle](https://github.com/olleolleolle))
+* Fix version in source code [#97](https://github.com/liufengyun/hashdiff/issues/97) ([@liufengyun](https://github.com/liufengyun))
@@ -11,2 +19,2 @@
-* Fix bug in ignore_keys option #88 (@Matzfan)
-* Exclude spec files from gem package #94 (@amatsuda)
+* Fix bug in ignore_keys option [#88](https://github.com/liufengyun/hashdiff/issues/88) ([@Matzfan](https://github.com/Matzfan))
+* Exclude spec files from gem package [#94](https://github.com/liufengyun/hashdiff/issues/94) ([@amatsuda](https://github.com/amatsuda))
@@ -16 +24 @@
-* Add ignore_keys option (#86 @Matzfan)
+* Add ignore_keys option ([#86](https://github.com/liufengyun/hashdiff/issues/86) [@Matzfan](https://github.com/Matzfan))
@@ -28,3 +36,3 @@
-* Fix typo in readme (#72 @koic)
-* Fix Rubocop offence (#73 @koic)
-* Bumps version to v1.0.0 (#74 @jfelchner)
+* Fix typo in readme ([#72](https://github.com/liufengyun/hashdiff/issues/72) [@koic](https://github.com/koic))
+* Fix Rubocop offence ([#73](https://github.com/liufengyun/hashdiff/issues/73) [@koic](https://github.com/koic))
+* Bumps version to v1.0.0 ([#74](https://github.com/liufengyun/hashdiff/issues/74) [@jfelchner](https://github.com/jfelchner))
@@ -34,2 +42,2 @@
-* fix warnings in ci (#69 @y-yagi)
-* drop warnings of the constant change (#70 @jfelchner)
+* fix warnings in ci ([#69](https://github.com/liufengyun/hashdiff/issues/69) [@y-yagi](https://github.com/y-yagi))
+* drop warnings of the constant change ([#70](https://github.com/liufengyun/hashdiff/issues/70) [@jfelchner](https://github.com/jfelchner))
@@ -39,3 +47,3 @@
-* refactoring (#56 #57 #59 #61 krzysiek1507)
-* fix typo in README (#64 @pboling)
-* change HashDiff to Hashdiff (#65 @jfelchner)
+* refactoring ([#56](https://github.com/liufengyun/hashdiff/issues/56) [#57](https://github.com/liufengyun/hashdiff/issues/57) [#59](https://github.com/liufengyun/hashdiff/issues/59) [#61](https://github.com/liufengyun/hashdiff/issues/61) [@krzysiek1507](https://github.com/krzysiek1507))
+* fix typo in README ([#64](https://github.com/liufengyun/hashdiff/issues/64) [@pboling](https://github.com/pboling))
+* change HashDiff to Hashdiff ([#65](https://github.com/liufengyun/hashdiff/issues/65) [@jfelchner](https://github.com/jfelchner))
@@ -45 +53 @@
-* Performance tweak (thanks @krzysiek1507: #51 #52 #53)
+* Performance tweak (thanks [@krzysiek1507](https://github.com/krzysiek1507): [#51](https://github.com/liufengyun/hashdiff/issues/51) [#52](https://github.com/liufengyun/hashdiff/issues/52) [#53](https://github.com/liufengyun/hashdiff/issues/53))
@@ -49 +57 @@
-* Add Rubocop and drops Ruby 1.9 support #47
+* Add Rubocop and drops Ruby 1.9 support [#47](https://github.com/liufengyun/hashdiff/issues/47)
@@ -53 +61 @@
-* remove 1.8.7 support from gemspec #39
+* remove 1.8.7 support from gemspec [#39](https://github.com/liufengyun/hashdiff/issues/39)
@@ -57 +65 @@
-* add option `use_lcs` #35
+* add option `use_lcs` [#35](https://github.com/liufengyun/hashdiff/issues/35)
@@ -61 +69 @@
-* add option `array_path` #34
+* add option `array_path` [#34](https://github.com/liufengyun/hashdiff/issues/34)
@@ -65 +73 @@
-* performance improvement of `#similar?` #31
+* performance improvement of `#similar?` [#31](https://github.com/liufengyun/hashdiff/issues/31)
@@ -69 +77 @@
-* replace `Fixnum` by `Integer` #28
+* replace `Fixnum` by `Integer` [#28](https://github.com/liufengyun/hashdiff/issues/28)
@@ -73 +81 @@
-* fix an error when a hash has mixed types #26
+* fix an error when a hash has mixed types [#26](https://github.com/liufengyun/hashdiff/issues/26)
@@ -81 +89 @@
-* improve performance of LCS algorithm #12
+* improve performance of LCS algorithm [#12](https://github.com/liufengyun/hashdiff/issues/12)
lib/hashdiff/compare_hashes.rb
--- /tmp/d20251031-2564-m9c8pm/hashdiff-1.1.2/lib/hashdiff/compare_hashes.rb 2025-10-31 03:02:37.088754561 +0000
+++ /tmp/d20251031-2564-m9c8pm/hashdiff-1.2.1/lib/hashdiff/compare_hashes.rb 2025-10-31 03:02:37.092754585 +0000
@@ -23,3 +23,3 @@
- added_keys = (obj2_keys - obj1_keys).sort_by(&:to_s)
- common_keys = (obj1_keys & obj2_keys).sort_by(&:to_s)
- deleted_keys = (obj1_keys - obj2_keys).sort_by(&:to_s)
+ added_keys = obj2_keys - obj1_keys
+ common_keys = obj1_keys & obj2_keys
+ deleted_keys = obj1_keys - obj2_keys
@@ -35,8 +35,32 @@
- # add deleted properties
- deleted_keys.each do |k|
- k = opts[:indifferent] ? obj1_lookup[k] : k
- change_key = Hashdiff.prefix_append_key(opts[:prefix], k, opts)
- custom_result = Hashdiff.custom_compare(opts[:comparison], change_key, obj1[k], nil)
-
- if custom_result
- result.concat(custom_result)
+ handle_key = lambda do |k, type|
+ case type
+ when :deleted
+ # add deleted properties
+ k = opts[:indifferent] ? obj1_lookup[k] : k
+ change_key = Hashdiff.prefix_append_key(opts[:prefix], k, opts)
+ custom_result = Hashdiff.custom_compare(opts[:comparison], change_key, obj1[k], nil)
+
+ if custom_result
+ result.concat(custom_result)
+ else
+ result << ['-', change_key, obj1[k]]
+ end
+ when :common
+ # recursive comparison for common keys
+ prefix = Hashdiff.prefix_append_key(opts[:prefix], k, opts)
+
+ k1 = opts[:indifferent] ? obj1_lookup[k] : k
+ k2 = opts[:indifferent] ? obj2_lookup[k] : k
+ result.concat(Hashdiff.diff(obj1[k1], obj2[k2], opts.merge(prefix: prefix)))
+ when :added
+ # added properties
+ change_key = Hashdiff.prefix_append_key(opts[:prefix], k, opts)
+
+ k = opts[:indifferent] ? obj2_lookup[k] : k
+ custom_result = Hashdiff.custom_compare(opts[:comparison], change_key, nil, obj2[k])
+
+ if custom_result
+ result.concat(custom_result)
+ else
+ result << ['+', change_key, obj2[k]]
+ end
@@ -44 +68 @@
- result << ['-', change_key, obj1[k]]
+ raise "Invalid type: #{type}"
@@ -48,20 +72,16 @@
- # recursive comparison for common keys
- common_keys.each do |k|
- prefix = Hashdiff.prefix_append_key(opts[:prefix], k, opts)
-
- k1 = opts[:indifferent] ? obj1_lookup[k] : k
- k2 = opts[:indifferent] ? obj2_lookup[k] : k
- result.concat(Hashdiff.diff(obj1[k1], obj2[k2], opts.merge(prefix: prefix)))
- end
-
- # added properties
- added_keys.each do |k|
- change_key = Hashdiff.prefix_append_key(opts[:prefix], k, opts)
-
- k = opts[:indifferent] ? obj2_lookup[k] : k
- custom_result = Hashdiff.custom_compare(opts[:comparison], change_key, nil, obj2[k])
-
- if custom_result
- result.concat(custom_result)
- else
- result << ['+', change_key, obj2[k]]
+ if opts[:preserve_key_order]
+ # Building lookups to speed up key classification
+ added_keys_lookup = added_keys.each_with_object({}) { |k, h| h[k] = true }
+ common_keys_lookup = common_keys.each_with_object({}) { |k, h| h[k] = true }
+ deleted_keys_lookup = deleted_keys.each_with_object({}) { |k, h| h[k] = true }
+
+ # Iterate through all keys, preserving obj1's key order and appending any new keys from obj2. Shared keys
+ # (found in both obj1 and obj2) follow obj1's order since uniq only keeps the first occurrence.
+ (obj1_keys + obj2_keys).uniq.each do |k|
+ if added_keys_lookup[k]
+ handle_key.call(k, :added)
+ elsif common_keys_lookup[k]
+ handle_key.call(k, :common)
+ elsif deleted_keys_lookup[k]
+ handle_key.call(k, :deleted)
+ end
@@ -68,0 +89,6 @@
+ else
+ # Keys are first grouped by operation type (deletions first, then changes, then additions), and then sorted
+ # alphabetically within each group.
+ deleted_keys.sort_by(&:to_s).each { |k| handle_key.call(k, :deleted) }
+ common_keys.sort_by(&:to_s).each { |k| handle_key.call(k, :common) }
+ added_keys.sort_by(&:to_s).each { |k| handle_key.call(k, :added) }
lib/hashdiff/diff.rb
--- /tmp/d20251031-2564-m9c8pm/hashdiff-1.1.2/lib/hashdiff/diff.rb 2025-10-31 03:02:37.089754567 +0000
+++ /tmp/d20251031-2564-m9c8pm/hashdiff-1.2.1/lib/hashdiff/diff.rb 2025-10-31 03:02:37.092754585 +0000
@@ -18,0 +19 @@
+ # * :preserve_key_order (Boolean) [false] If false, operations are grouped by type (-, ~, then +) then by hash key alphabetically. If true, preserves the original key order from the first hash and appends new keys from the second hash in order.
@@ -64,0 +66 @@
+ # * :preserve_key_order (Boolean) [false] If false, operations are grouped by type (-, ~, then +) then by hash key alphabetically. If true, preserves the original key order from the first hash and appends new keys from the second hash in order.
@@ -91 +93,2 @@
- use_lcs: true
+ use_lcs: true,
+ preserve_key_order: false
lib/hashdiff/version.rb
--- /tmp/d20251031-2564-m9c8pm/hashdiff-1.1.2/lib/hashdiff/version.rb 2025-10-31 03:02:37.089754567 +0000
+++ /tmp/d20251031-2564-m9c8pm/hashdiff-1.2.1/lib/hashdiff/version.rb 2025-10-31 03:02:37.093754591 +0000
@@ -4 +4 @@
- VERSION = '1.1.2'.freeze
+ VERSION = '1.2.1'.freeze |
gem compare public_suffix 6.0.1 6.0.2Compared versions: ["6.0.1", "6.0.2"]
DIFFERENT date:
6.0.1: 2024-07-23 00:00:00 UTC
6.0.2: 1980-01-02 00:00:00 UTC
DIFFERENT metadata:
6.0.1: {"bug_tracker_uri" => "https://github.com/weppos/publicsuffix-ruby/issues", "changelog_uri" => "https://github.com/weppos/publicsuffix-ruby/blob/master/CHANGELOG.md", "documentation_uri" => "https://rubydoc.info/gems/public_suffix/6.0.1", "homepage_uri" => "https://simonecarletti.com/code/publicsuffix-ruby", "source_code_uri" => "https://github.com/weppos/publicsuffix-ruby/tree/v6.0.1"}
6.0.2: {"bug_tracker_uri" => "https://github.com/weppos/publicsuffix-ruby/issues", "changelog_uri" => "https://github.com/weppos/publicsuffix-ruby/blob/master/CHANGELOG.md", "documentation_uri" => "https://rubydoc.info/gems/public_suffix/6.0.2", "homepage_uri" => "https://simonecarletti.com/code/publicsuffix-ruby", "source_code_uri" => "https://github.com/weppos/publicsuffix-ruby/tree/v6.0.2", "funding_uri" => "https://github.com/sponsors/weppos"}
DIFFERENT rubygems_version:
6.0.1: 3.5.11
6.0.2: 3.6.7
DIFFERENT version:
6.0.1: 6.0.1
6.0.2: 6.0.2
DIFFERENT files:
6.0.1->6.0.2:
* Changed:
CHANGELOG.md +7/-0
LICENSE.txt +1/-1
README.md +1/-1
data/list.txt +1691/-1743
lib/public_suffix.rb +1/-1
lib/public_suffix/domain.rb +1/-1
lib/public_suffix/errors.rb +1/-1
lib/public_suffix/list.rb +1/-1
lib/public_suffix/rule.rb +1/-1
lib/public_suffix/version.rb +2/-2
DIFFERENT extra_rdoc_files:
6.0.1->6.0.2:
* Changed:
LICENSE.txt +1/-1 |
|
gem compare webmock 3.25.1 3.26.1Compared versions: ["3.25.1", "3.26.1"]
DIFFERENT date:
3.25.1: 2025-03-08 00:00:00 UTC
3.26.1: 2025-10-30 00:00:00 UTC
DIFFERENT metadata:
3.25.1: {"bug_tracker_uri" => "https://github.com/bblimke/webmock/issues", "changelog_uri" => "https://github.com/bblimke/webmock/blob/v3.25.1/CHANGELOG.md", "documentation_uri" => "https://www.rubydoc.info/gems/webmock/3.25.1", "source_code_uri" => "https://github.com/bblimke/webmock/tree/v3.25.1", "wiki_uri" => "https://github.com/bblimke/webmock/wiki"}
3.26.1: {"bug_tracker_uri" => "https://github.com/bblimke/webmock/issues", "changelog_uri" => "https://github.com/bblimke/webmock/blob/v3.26.1/CHANGELOG.md", "documentation_uri" => "https://www.rubydoc.info/gems/webmock/3.26.1", "source_code_uri" => "https://github.com/bblimke/webmock/tree/v3.26.1", "wiki_uri" => "https://github.com/bblimke/webmock/wiki"}
DIFFERENT rubygems_version:
3.25.1: 3.2.3
3.26.1: 3.5.16
DIFFERENT version:
3.25.1: 3.25.1
3.26.1: 3.26.1
DIFFERENT files:
3.25.1->3.26.1:
* Changed:
CHANGELOG.md +18/-0
README.md +2/-0
lib/webmock/http_lib_adapters/async_http_client_adapter.rb +1/-1
lib/webmock/http_lib_adapters/em_http_request_adapter.rb +0/-2
lib/webmock/http_lib_adapters/net_http.rb +2/-2
lib/webmock/request_pattern.rb +3/-3
lib/webmock/version.rb +1/-1
DIFFERENT development dependencies:
3.25.1->3.26.1:
* Deleted:
mutex_m [">= 0"] (development) |
gem compare --diff webmock 3.25.1 3.26.1Compared versions: ["3.25.1", "3.26.1"]
DIFFERENT files:
3.25.1->3.26.1:
* Changed:
CHANGELOG.md
--- /tmp/d20251031-3097-4c4lux/webmock-3.25.1/CHANGELOG.md 2025-10-31 03:03:22.706987492 +0000
+++ /tmp/d20251031-3097-4c4lux/webmock-3.26.1/CHANGELOG.md 2025-10-31 03:03:22.715987529 +0000
@@ -2,0 +3,18 @@
+# 3.26.1
+
+ Fix compatibility with recent async-http versions
+
+ Thanks to [Mikhail Doronin](https://github.com/misdoro)
+
+# 3.26.0
+
+* Support Addressable::URI in request patterns
+
+ Thanks to [Alexey Zapparov](https://github.com/ixti)
+
+# 3.25.2
+
+* Return support for `em_http_request`
+
+ Thanks to [Oleg](https://github.com/Koilanetroc)
+
README.md
--- /tmp/d20251031-3097-4c4lux/webmock-3.25.1/README.md 2025-10-31 03:03:22.706987492 +0000
+++ /tmp/d20251031-3097-4c4lux/webmock-3.26.1/README.md 2025-10-31 03:03:22.716987533 +0000
@@ -1210,0 +1211,2 @@
+* Oleg
+* Mikhail Doronin
lib/webmock/http_lib_adapters/async_http_client_adapter.rb
--- /tmp/d20251031-3097-4c4lux/webmock-3.25.1/lib/webmock/http_lib_adapters/async_http_client_adapter.rb 2025-10-31 03:03:22.707987496 +0000
+++ /tmp/d20251031-3097-4c4lux/webmock-3.26.1/lib/webmock/http_lib_adapters/async_http_client_adapter.rb 2025-10-31 03:03:22.717987537 +0000
@@ -214 +214 @@
- o.push [k, v]
+ o.push [k, v] unless k.downcase == 'content-length' # async-http appends the exact content-length automatically
lib/webmock/http_lib_adapters/em_http_request_adapter.rb
--- /tmp/d20251031-3097-4c4lux/webmock-3.25.1/lib/webmock/http_lib_adapters/em_http_request_adapter.rb 2025-10-31 03:03:22.708987500 +0000
+++ /tmp/d20251031-3097-4c4lux/webmock-3.26.1/lib/webmock/http_lib_adapters/em_http_request_adapter.rb 2025-10-31 03:03:22.717987537 +0000
@@ -3,2 +2,0 @@
-return if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.4.0')
-
lib/webmock/http_lib_adapters/net_http.rb
--- /tmp/d20251031-3097-4c4lux/webmock-3.25.1/lib/webmock/http_lib_adapters/net_http.rb 2025-10-31 03:03:22.709987504 +0000
+++ /tmp/d20251031-3097-4c4lux/webmock-3.26.1/lib/webmock/http_lib_adapters/net_http.rb 2025-10-31 03:03:22.719987546 +0000
@@ -203 +203 @@
- unless @@alredy_checked_for_right_http_connection ||= false
+ unless @@already_checked_for_right_http_connection ||= false
@@ -205 +205 @@
- @@alredy_checked_for_right_http_connection = true
+ @@already_checked_for_right_http_connection = true
lib/webmock/request_pattern.rb
--- /tmp/d20251031-3097-4c4lux/webmock-3.25.1/lib/webmock/request_pattern.rb 2025-10-31 03:03:22.711987513 +0000
+++ /tmp/d20251031-3097-4c4lux/webmock-3.26.1/lib/webmock/request_pattern.rb 2025-10-31 03:03:22.721987554 +0000
@@ -89,2 +89,2 @@
- elsif uri.is_a?(String)
- URIStringPattern.new(uri)
+ elsif uri.respond_to?(:to_str)
+ URIStringPattern.new(uri.to_str)
@@ -92 +92 @@
- raise ArgumentError.new("URI should be a String, Regexp, Addressable::Template or a callable object. Got: #{uri.class}")
+ raise ArgumentError.new("URI should be a String, Regexp, Addressable::Template, a callable object, or respond to #to_str. Got: #{uri.class}")
lib/webmock/version.rb
--- /tmp/d20251031-3097-4c4lux/webmock-3.25.1/lib/webmock/version.rb 2025-10-31 03:03:22.715987529 +0000
+++ /tmp/d20251031-3097-4c4lux/webmock-3.26.1/lib/webmock/version.rb 2025-10-31 03:03:22.724987566 +0000
@@ -4 +4 @@
- VERSION = '3.25.1' unless defined?(::WebMock::VERSION)
+ VERSION = '3.26.1' 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.25.1 to 3.26.1.
Release notes
Sourced from webmock's releases.
Changelog
Sourced from webmock's changelog.
Commits
56cb661Version 3.26.1ea4cea3Merge pull request #1109 from misdoro/duplicate_headersc05fe47Split SAMPLE_REQUEST_HEADERS and SAMPLE_RESPONSE_HEADERS to be more realistic5f46ecaFix specs with recent Async-http versions.aa747baRun CI on pushes to all branches348622fVersion 3.26.0710131aAdded .devcontainer to ignore.52cc74cDon't verify peer certificate in requests to google.af3655cUpdated request_pattern_spec.rb after error message was updated.00bd15aMerge branch 'ixti-fix-request-pattern-regression'Dependabot 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)