Bump webmock from 3.23.1 to 3.24.0 #674
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}
gem compare hashdiff 1.1.0 1.1.1Compared versions: ["1.1.0", "1.1.1"]
DIFFERENT date:
1.1.0: 2023-12-14 00:00:00 UTC
1.1.1: 2024-08-02 00:00:00 UTC
DIFFERENT rubygems_version:
1.1.0: 3.4.10
1.1.1: 3.3.5
DIFFERENT version:
1.1.0: 1.1.0
1.1.1: 1.1.1
DIFFERENT files:
1.1.0->1.1.1:
* Deleted:
spec/hashdiff/best_diff_spec.rb
spec/hashdiff/diff_array_spec.rb
spec/hashdiff/diff_spec.rb
spec/hashdiff/lcs_spec.rb
spec/hashdiff/linear_compare_array_spec.rb
spec/hashdiff/patch_spec.rb
spec/hashdiff/readme_spec.rb
spec/hashdiff/util_spec.rb
spec/spec_helper.rb
* Added:
.github/workflows/ci.yml +28/-0
* Changed:
.rubocop.yml +4/-2
README.md +16/-13
changelog.md +6/-1
hashdiff.gemspec +1/-1
lib/hashdiff/compare_hashes.rb +5/-1
lib/hashdiff/diff.rb +3/-3
lib/hashdiff/version.rb +1/-1 |
gem compare --diff hashdiff 1.1.0 1.1.1Compared versions: ["1.1.0", "1.1.1"]
DIFFERENT files:
1.1.0->1.1.1:
* Deleted:
spec/hashdiff/best_diff_spec.rb
spec/hashdiff/diff_array_spec.rb
spec/hashdiff/diff_spec.rb
spec/hashdiff/lcs_spec.rb
spec/hashdiff/linear_compare_array_spec.rb
spec/hashdiff/patch_spec.rb
spec/hashdiff/readme_spec.rb
spec/hashdiff/util_spec.rb
spec/spec_helper.rb
* Added:
.github/workflows/ci.yml
--- /tmp/20241001-1835-o3yki4 2024-10-01 02:14:26.536113524 +0000
+++ /tmp/d20241001-1835-xowqiy/hashdiff-1.1.1/.github/workflows/ci.yml 2024-10-01 02:14:26.533113501 +0000
@@ -0,0 +1,28 @@
+name: ci
+
+on:
+ - pull_request
+ - push
+
+jobs:
+ build:
+ strategy:
+ fail-fast: false
+ matrix:
+ ruby:
+ - 2.7
+ - 3.0
+ - 3.1
+ - 3.2
+ - 3.3
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+ - name: Set up Ruby
+ uses: ruby/setup-ruby@v1
+ with:
+ ruby-version: ${{ matrix.ruby }}
+ - name: Install dependencies
+ run: bundle install --jobs $(nproc) --retry 3
+ - name: Run rake
+ run: bundle exec rake
* Changed:
.rubocop.yml
--- /tmp/d20241001-1835-xowqiy/hashdiff-1.1.0/.rubocop.yml 2024-10-01 02:14:26.529113470 +0000
+++ /tmp/d20241001-1835-xowqiy/hashdiff-1.1.1/.rubocop.yml 2024-10-01 02:14:26.533113501 +0000
@@ -12 +12 @@
-Metrics/LineLength:
+Layout/LineLength:
@@ -39 +39,3 @@
-RSpec/FilePath:
+RSpec/SpecFilePathFormat:
+ Enabled: false
+RSpec/NoExpectationExample:
README.md
--- /tmp/d20241001-1835-xowqiy/hashdiff-1.1.0/README.md 2024-10-01 02:14:26.529113470 +0000
+++ /tmp/d20241001-1835-xowqiy/hashdiff-1.1.1/README.md 2024-10-01 02:14:26.534113509 +0000
@@ -1 +1 @@
-# Hashdiff [](http://travis-ci.org/liufengyun/hashdiff) [](http://badge.fury.io/rb/hashdiff)
+# Hashdiff [](https://github.com/liufengyun/hashdiff/actions?query=workflow%3Aci) [](http://badge.fury.io/rb/hashdiff)
@@ -122 +122 @@
-The `:ignore_keys` option allows you to specify one or more keys to ignore, which defaults to `[]` (none). Ignored keys are ignored at all levels. For example:
+The `:ignore_keys` option allows you to specify one or more keys to ignore, which defaults to `[]` (none). Ignored keys are ignored at all levels in both hashes. For example:
@@ -125,4 +125,4 @@
-a = { a: 1, b: { d: 2, a: 3 }, c: 4 }
-b = { a: 2, b: { d: 2, a: 7 }, c: 5 }
-diff = Hashdiff.diff(a, b, ignore_keys: :a)
-diff.should == [['~', 'c', 4, 5]]
+a = { a: 4, g: 0, b: { a: 5, c: 6, e: 1 } }
+b = { b: { a: 7, c: 3, f: 1 }, d: 8 }
+diff = Hashdiff.diff(a, b, ignore_keys: %i[a f])
+diff.should == [['-', 'g', 0], ['-', 'b.e', 1], ['~', 'b.c', 6, 3], ['+', 'd', 8]]
@@ -130,2 +130,2 @@
-If you wish instead to ignore keys at a particlar level you should
-use a [custom comparison method](https://github.com/liufengyun/hashdiff#specifying-a-custom-comparison-method) instead. For example:
+If you wish instead to ignore keys at a particlar level you should
+use a [custom comparison method](https://github.com/liufengyun/hashdiff#specifying-a-custom-comparison-method) instead. For example to diff only at the 2nd level of both hashes:
@@ -134,5 +134,8 @@
-a = { a: 1, b: { d: 2, a: 3 }, c: 4 }
-b = { a: 2, b: { d: 2, a: 7 }, c: 5 }
-diff = Hashdiff.diff(a, b) { |path, _e, _a| true if path == 'b.a' } # note '.' is the default delimiter
-diff.should == [['~', 'a', 1, 2], ['~', 'c', 4, 5]]
-```
+a = { a: 4, g: 0, b: { a: 5, c: 6, e: 1 } }
+b = { b: { a: 7, c: 3, f: 1 }, d: 8 }
+diff = Hashdiff.diff(a, b) do |path, _e, _a|
+ arr = path.split('.')
+ true if %w[a f].include?(arr.last) && arr.size == 2 # note '.' is the default delimiter
+end
+diff.should == [['-', 'a', 4], ['-', 'g', 0], ['-', 'b.e', 1], ['~', 'b.c', 6, 3], ['+', 'd', 8]]
+```
changelog.md
--- /tmp/d20241001-1835-xowqiy/hashdiff-1.1.0/changelog.md 2024-10-01 02:14:26.530113478 +0000
+++ /tmp/d20241001-1835-xowqiy/hashdiff-1.1.1/changelog.md 2024-10-01 02:14:26.534113509 +0000
@@ -3 +3,6 @@
-## v1.1.0 2020-02-25
+## v1.1.1 2024-08-02
+
+* Fix bug in ignore_keys option #88 (@Matzfan)
+* Exclude spec files from gem package #94 (@amatsuda)
+
+## v1.1.0 2023-12-14
hashdiff.gemspec
--- /tmp/d20241001-1835-xowqiy/hashdiff-1.1.0/hashdiff.gemspec 2024-10-01 02:14:26.530113478 +0000
+++ /tmp/d20241001-1835-xowqiy/hashdiff-1.1.1/hashdiff.gemspec 2024-10-01 02:14:26.534113509 +0000
@@ -13 +13 @@
- s.files = `git ls-files`.split("\n")
+ s.files = `git ls-files`.split("\n").grep_v(%r{^spec/})
lib/hashdiff/compare_hashes.rb
--- /tmp/d20241001-1835-xowqiy/hashdiff-1.1.0/lib/hashdiff/compare_hashes.rb 2024-10-01 02:14:26.530113478 +0000
+++ /tmp/d20241001-1835-xowqiy/hashdiff-1.1.1/lib/hashdiff/compare_hashes.rb 2024-10-01 02:14:26.535113517 +0000
@@ -29 +29,5 @@
- opts[:ignore_keys].each { |k| common_keys.delete k }
+ opts[:ignore_keys].each do |k|
+ added_keys.delete k
+ common_keys.delete k
+ deleted_keys.delete k
+ end
lib/hashdiff/diff.rb
--- /tmp/d20241001-1835-xowqiy/hashdiff-1.1.0/lib/hashdiff/diff.rb 2024-10-01 02:14:26.530113478 +0000
+++ /tmp/d20241001-1835-xowqiy/hashdiff-1.1.1/lib/hashdiff/diff.rb 2024-10-01 02:14:26.535113517 +0000
@@ -12 +12 @@
- # * :ignore_keys (Symbol, String or Array) [[]] a list of keys to ignore. No comparison is made for the specified key(s)
+ # * :ignore_keys (Symbol, String or Array) [[]] a list of keys to ignore. No comparison is made for the specified key(s) in either hash
@@ -57 +57 @@
- # * :ignore_keys (Symbol, String or Array) [[]] a list of keys to ignore. No comparison is made for the specified key(s)
+ # * :ignore_keys (Symbol, String or Array) [[]] a list of keys to ignore. No comparison is made for the specified key(s) in either hash
@@ -96 +96 @@
- opts[:ignore_keys] = [*opts[:ignore_keys]] # splat covers single sym/string case
+ opts[:ignore_keys] = [*opts[:ignore_keys]]
lib/hashdiff/version.rb
--- /tmp/d20241001-1835-xowqiy/hashdiff-1.1.0/lib/hashdiff/version.rb 2024-10-01 02:14:26.531113486 +0000
+++ /tmp/d20241001-1835-xowqiy/hashdiff-1.1.1/lib/hashdiff/version.rb 2024-10-01 02:14:26.535113517 +0000
@@ -4 +4 @@
- VERSION = '1.1.0'.freeze
+ VERSION = '1.1.1'.freeze |
gem compare public_suffix 6.0.0 6.0.1Compared versions: ["6.0.0", "6.0.1"]
DIFFERENT date:
6.0.0: 2024-06-17 00:00:00 UTC
6.0.1: 2024-07-23 00:00:00 UTC
DIFFERENT metadata:
6.0.0: {"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.0", "homepage_uri"=>"https://simonecarletti.com/code/publicsuffix-ruby", "source_code_uri"=>"https://github.com/weppos/publicsuffix-ruby/tree/v6.0.0"}
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"}
DIFFERENT version:
6.0.0: 6.0.0
6.0.1: 6.0.1
DIFFERENT files:
6.0.0->6.0.1:
* Changed:
CHANGELOG.md +7/-0
data/list.txt +117/-55
lib/public_suffix/version.rb +1/-1 |
gem compare --diff public_suffix 6.0.0 6.0.1Compared versions: ["6.0.0", "6.0.1"]
DIFFERENT files:
6.0.0->6.0.1:
* Changed:
CHANGELOG.md
--- /tmp/d20241001-1903-tfdpmk/public_suffix-6.0.0/CHANGELOG.md 2024-10-01 02:14:32.742161095 +0000
+++ /tmp/d20241001-1903-tfdpmk/public_suffix-6.0.1/CHANGELOG.md 2024-10-01 02:14:32.746161126 +0000
@@ -5,0 +6,7 @@
+## 6.0.1
+
+### Changed
+
+- Updated definitions.
+
+
data/list.txt
--- /tmp/d20241001-1903-tfdpmk/public_suffix-6.0.0/data/list.txt 2024-10-01 02:14:32.745161118 +0000
+++ /tmp/d20241001-1903-tfdpmk/public_suffix-6.0.1/data/list.txt 2024-10-01 02:14:32.749161149 +0000
@@ -35 +35 @@
-// aero : see https://www.information.aero/index.php?id=66
+// aero : https://information.aero/registration/policies/dmp
@@ -36,0 +37,11 @@
+// 2LDs
+airline.aero
+airport.aero
+// 2LDs (currently not accepting registration, seemingly never have)
+// As of 2024-07, these are marked as reserved for potential 3LD
+// registrations (clause 11 "allocated subdomains" in the 2006 TLD
+// policy), but the relevant industry partners have not opened them up
+// for registration. Current status can be determined from the TLD's
+// policy document: 2LDs that are open for registration must list
+// their policy in the TLD's policy. Any 2LD without such a policy is
+// not open for registrations.
@@ -43,3 +53,0 @@
-aircraft.aero
-airline.aero
-airport.aero
@@ -47 +54,0 @@
-airtraffic.aero
@@ -48,0 +56,2 @@
+aircraft.aero
+airtraffic.aero
@@ -50 +58,0 @@
-amusement.aero
@@ -80,0 +89 @@
+freight.aero
@@ -94,0 +104 @@
+marketplace.aero
@@ -116,0 +127 @@
+taxi.aero
@@ -1017 +1028 @@
-// fi : https://en.wikipedia.org/wiki/.fi
+// fi : https://www.iana.org/domains/root/db/fi.html
@@ -1019 +1030 @@
-// aland.fi : https://en.wikipedia.org/wiki/.ax
+// aland.fi : https://www.iana.org/domains/root/db/ax.html
@@ -1023 +1033,0 @@
-// TODO: Check for updates (expected to be phased out around Q1/2009)
@@ -6712 +6722 @@
-// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2024-06-13T15:15:16Z
+// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2024-07-12T15:14:39Z
@@ -10002,4 +10011,0 @@
-// shaw : Shaw Cablesystems G.P.
-// https://www.iana.org/domains/root/db/shaw.html
-shaw
-
@@ -10498 +10504 @@
-// vana : Internet Naming Company LLC
+// vana : D3 Registry LLC
@@ -11348 +11354 @@
-// Reference: 09588633-91fe-49d8-b4e7-ec36496d11f3
+// Reference: cb38c251-c93d-4cda-81ec-e72c4f0fdb72
@@ -11349,0 +11356 @@
+auth.ap-east-1.amazoncognito.com
@@ -11359,0 +11367 @@
+auth.ca-west-1.amazoncognito.com
@@ -11495 +11503 @@
-// Reference: 87f24ece-a77e-40e8-bb4a-f6b74fe9f975
+// Reference: f5ea5d0a-ec6a-4f23-ac1c-553fbff13f5c
@@ -11501,0 +11510 @@
+*.ap-northeast-3.airflow.amazonaws.com
@@ -11502,0 +11512 @@
+*.ap-south-2.airflow.amazonaws.com
@@ -11504,0 +11515,2 @@
+*.ap-southeast-3.airflow.amazonaws.com
+*.ap-southeast-4.airflow.amazonaws.com
@@ -11505,0 +11518 @@
+*.ca-west-1.airflow.amazonaws.com
@@ -11506,0 +11520 @@
+*.eu-central-2.airflow.amazonaws.com
@@ -11508,0 +11523 @@
+*.eu-south-2.airflow.amazonaws.com
@@ -11511,0 +11527,2 @@
+*.il-central-1.airflow.amazonaws.com
+*.me-central-1.airflow.amazonaws.com
@@ -11905,0 +11923,5 @@
+// Amazon SageMaker with MLflow
+// Submited by: AWS Security <psl-maintainers@amazon.com>
+// Reference: c19f92b3-a82a-452d-8189-831b572eea7e
+*.experiments.sagemaker.aws
+
@@ -11922,2 +11944,2 @@
-// Reference: 5ecce854-c033-4fc4-a755-1a9916d9a9bb
-*.amplifyapp.com
+// Reference: c35bed18-6f4f-424f-9298-5756f2f7d72b
+amplifyapp.com
@@ -12347,3 +12368,0 @@
-// c.la : http://www.c.la/
-c.la
-
@@ -12521,3 +12540,3 @@
-// cPanel L.L.C. : https://www.cpanel.net/
-// Submitted by Dustin Scherer <public.suffix@cpanel.net>
-*.cprapid.com
+// Craft Docs Ltd : https://www.craft.do/
+// Submitted by Zsombor Fuszenecker <security@craft.do>
+craft.me
@@ -12552,0 +12572,4 @@
+// cyber_Folks S.A. : https://cyberfolks.pl
+// Submitted by Bartlomiej Kida <security@cyberfolks.pl>
+cfolks.pl
+
@@ -12637,0 +12661,6 @@
+// dhosting.pl Sp. z o.o.: https://dhosting.pl/
+// Submitted by Michal Kokoszkiewicz <bok@dhosting.pl>
+dfirma.pl
+dkonto.pl
+you2.pl
+
@@ -12672,0 +12702,4 @@
+// Dreamyoungs, Inc. : https://durumis.com
+// Submitted by Infra Team <infra@durumis.com>
+durumis.com
+
@@ -13400 +13433 @@
-// Future Versatile Group. ：https://www.fvg-on.net/
+// Future Versatile Group. : https://www.fvg-on.net/
@@ -13622,4 +13654,0 @@
-// GlobeHosting, Inc.
-// Submitted by Zoltan Egresi <egresi@globehosting.com>
-ro.im
-
@@ -13766,0 +13796,9 @@
+// Hatena Co., Ltd. : https://hatena.co.jp
+// Submitted by Masato Nakamura <blog-developers@hatena.ne.jp>
+hatenablog.com
+hatenadiary.com
+hateblo.jp
+hatenablog.jp
+hatenadiary.jp
+hatenadiary.org
+
@@ -13831 +13869 @@
-// HostyHosting (hostyhosting.com)
+// HostyHosting (https://hostyhosting.com)
@@ -14245,4 +14282,0 @@
-// Mail Transfer Platform : https://www.neupeer.com
-// Submitted by Li Hui <lihui@neupeer.com>
-cn.vu
-
@@ -14386,0 +14421,4 @@
+// Netfy Domains : https://netfy.domains
+// Submitted by Suranga Ranasinghe <security@mavicsoft.com>
+netfy.app
+
@@ -14589,0 +14628,4 @@
+// Obl.ong : <https://obl.ong>
+// Submitted by Reese Armstrong <team@obl.ong>
+obl.ong
+
@@ -14771,6 +14812,0 @@
-// Plesk : https://www.plesk.com/
-// Submitted by Anton Akhtyamov <program-managers@plesk.com>
-pleskns.com
-pdns.page
-plesk.page
-
@@ -14800,2 +14836,2 @@
-//prequalifyme.today : https://prequalifyme.today
-//Submitted by DeepakTiwari deepak@ivylead.io
+// prequalifyme.today : https://prequalifyme.today
+// Submitted by DeepakTiwari deepak@ivylead.io
@@ -14855,0 +14892,5 @@
+// Raidboxes GmbH : https://raidboxes.de
+// Submitted by Auke Tembrink <hostmaster@raidboxes.de>
+myrdbx.io
+site.rb-hosting.io
+
@@ -14860,4 +14900,0 @@
-// Redstar Consultants : https://www.redstarconsultants.com/
-// Submitted by Jons Slemmer <jons@redstarconsultants.com>
-instantcloud.cn
-
@@ -14900,4 +14936,0 @@
-// Rakuten Games, Inc : https://dev.viberplay.io
-// Submitted by Joshua Zhang <public-suffix@rgames.jp>
-g.vbrplsbx.io
-
@@ -15054 +15087 @@
-// Submitted by Michael Biven <mbiven@salesforce.com> and Aaron Romeo <aaron.romeo@salesforce.com>
+// Submitted by Salesforce Public Suffix List Team <public-suffix-list@salesforce.com>
@@ -15058,0 +15092,8 @@
+*.d.crm.dev
+*.w.crm.dev
+*.wa.crm.dev
+*.wb.crm.dev
+*.wc.crm.dev
+*.wd.crm.dev
+*.we.crm.dev
+*.wf.crm.dev
@@ -15145,0 +15187,4 @@
+// Servebolt AS: https://servebolt.com
+// Submitted by Daniel Kjeserud <cloudops@servebolt.com>
+servebolt.cloud
+
@@ -15155,0 +15201,4 @@
+// Shanghai Accounting Society : https://www.sasf.org.cn
+// Submitted by Information Administration <info@sasf.org.cn>
+as.sh.cn
+
@@ -15382 +15430,0 @@
-su.paba.se
@@ -15428 +15476 @@
-// TASK geographical domains (www.task.gda.pl/uslugi/dns)
+// TASK geographical domains (https://www.task.gda.pl/uslugi/dns)
@@ -15434,0 +15483,5 @@
+// tawk.to, Inc : https://www.tawk.to
+// Submitted by tawk.to developer team <dev-accounts@tawk.to>
+p.tawk.email
+p.tawkto.email
+
@@ -15475 +15528 @@
-// Submitted by Antoine Beaupré <anarcat@torproject.org
+// Submitted by Antoine Beaupré <anarcat@torproject.org>
@@ -15644,0 +15698,9 @@
+
+// WebPros International, LLC : https://webpros.com/
+// Submitted by Nicolas Rochelemagne <public.suffix@webpros.com>
+cprapid.com
+pleskns.com
+wp2.host
+pdns.page
+plesk.page
+wpsquared.site
lib/public_suffix/version.rb
--- /tmp/d20241001-1903-tfdpmk/public_suffix-6.0.0/lib/public_suffix/version.rb 2024-10-01 02:14:32.746161126 +0000
+++ /tmp/d20241001-1903-tfdpmk/public_suffix-6.0.1/lib/public_suffix/version.rb 2024-10-01 02:14:32.750161156 +0000
@@ -12 +12 @@
- VERSION = "6.0.0"
+ VERSION = "6.0.1" |
gem compare rexml 3.3.7 3.3.8Compared versions: ["3.3.7", "3.3.8"]
DIFFERENT date:
3.3.7: 2024-09-04 00:00:00 UTC
3.3.8: 2024-09-29 00:00:00 UTC
DIFFERENT metadata:
3.3.7: {"changelog_uri"=>"https://github.com/ruby/rexml/releases/tag/v3.3.7"}
3.3.8: {"changelog_uri"=>"https://github.com/ruby/rexml/releases/tag/v3.3.8"}
DIFFERENT version:
3.3.7: 3.3.7
3.3.8: 3.3.8
DIFFERENT files:
3.3.7->3.3.8:
* Changed:
NEWS.md +21/-0
lib/rexml/parsers/baseparser.rb +3/-2
lib/rexml/parsers/sax2parser.rb +2/-0
lib/rexml/rexml.rb +1/-1
DIFFERENT extra_rdoc_files:
3.3.7->3.3.8:
* Changed:
NEWS.md +21/-0 |
gem compare --diff rexml 3.3.7 3.3.8Compared versions: ["3.3.7", "3.3.8"]
DIFFERENT files:
3.3.7->3.3.8:
* Changed:
NEWS.md
--- /tmp/d20241001-2033-3svek9/rexml-3.3.7/NEWS.md 2024-10-01 02:14:38.905206509 +0000
+++ /tmp/d20241001-2033-3svek9/rexml-3.3.8/NEWS.md 2024-10-01 02:14:38.915206581 +0000
@@ -2,0 +3,21 @@
+## 3.3.8 - 2024-09-29 {#version-3-3-8}
+
+### Improvements
+
+ * SAX2: Improve parse performance.
+ * GH-207
+ * Patch by NAITOH Jun.
+
+### Fixes
+
+ * Fixed a bug that unexpected attribute namespace conflict error for
+ the predefined "xml" namespace is reported.
+ * GH-208
+ * Patch by KITAITI Makoto
+
+### Thanks
+
+ * NAITOH Jun
+
+ * KITAITI Makoto
+
lib/rexml/parsers/baseparser.rb
--- /tmp/d20241001-2033-3svek9/rexml-3.3.7/lib/rexml/parsers/baseparser.rb 2024-10-01 02:14:38.912206559 +0000
+++ /tmp/d20241001-2033-3svek9/rexml-3.3.8/lib/rexml/parsers/baseparser.rb 2024-10-01 02:14:38.922206631 +0000
@@ -158,0 +159 @@
+ XML_PREFIXED_NAMESPACE = "http://www.w3.org/XML/1998/namespace"
@@ -188 +189 @@
- @namespaces = {}
+ @namespaces = {"xml" => Private::XML_PREFIXED_NAMESPACE}
@@ -793 +794 @@
- if value != "http://www.w3.org/XML/1998/namespace"
+ if value != Private::XML_PREFIXED_NAMESPACE
lib/rexml/parsers/sax2parser.rb
--- /tmp/d20241001-2033-3svek9/rexml-3.3.7/lib/rexml/parsers/sax2parser.rb 2024-10-01 02:14:38.912206559 +0000
+++ /tmp/d20241001-2033-3svek9/rexml-3.3.8/lib/rexml/parsers/sax2parser.rb 2024-10-01 02:14:38.923206638 +0000
@@ -261,0 +262,2 @@
+ return nil if @namespace_stack.empty?
+
lib/rexml/rexml.rb
--- /tmp/d20241001-2033-3svek9/rexml-3.3.7/lib/rexml/rexml.rb 2024-10-01 02:14:38.913206566 +0000
+++ /tmp/d20241001-2033-3svek9/rexml-3.3.8/lib/rexml/rexml.rb 2024-10-01 02:14:38.924206645 +0000
@@ -34 +34 @@
- VERSION = "3.3.7"
+ VERSION = "3.3.8" |
gem compare webmock 3.23.1 3.24.0Compared versions: ["3.23.1", "3.24.0"]
DIFFERENT date:
3.23.1: 2024-05-24 00:00:00 UTC
3.24.0: 2024-09-30 00:00:00 UTC
DIFFERENT metadata:
3.23.1: {"bug_tracker_uri"=>"https://github.com/bblimke/webmock/issues", "changelog_uri"=>"https://github.com/bblimke/webmock/blob/v3.23.1/CHANGELOG.md", "documentation_uri"=>"https://www.rubydoc.info/gems/webmock/3.23.1", "source_code_uri"=>"https://github.com/bblimke/webmock/tree/v3.23.1", "wiki_uri"=>"https://github.com/bblimke/webmock/wiki"}
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"}
DIFFERENT rubygems_version:
3.23.1: 3.5.7
3.24.0: 3.5.16
DIFFERENT version:
3.23.1: 3.23.1
3.24.0: 3.24.0
DIFFERENT files:
3.23.1->3.24.0:
* Deleted:
lib/webmock/util/json.rb
* Added:
lib/webmock/util/parsers/json.rb +72/-0
lib/webmock/util/parsers/parse_error.rb +7/-0
lib/webmock/util/parsers/xml.rb +16/-0
* Changed:
CHANGELOG.md +20/-0
README.md +2/-0
lib/webmock.rb +2/-2
lib/webmock/http_lib_adapters/async_http_client_adapter.rb +4/-3
lib/webmock/http_lib_adapters/em_http_request_adapter.rb +2/-0
lib/webmock/http_lib_adapters/http_rb/streamer.rb +4/-0
lib/webmock/http_lib_adapters/patron_adapter.rb +1/-1
lib/webmock/request_pattern.rb +9/-4
lib/webmock/version.rb +1/-1 |
gem compare --diff webmock 3.23.1 3.24.0Compared versions: ["3.23.1", "3.24.0"]
DIFFERENT files:
3.23.1->3.24.0:
* Deleted:
lib/webmock/util/json.rb
* Added:
lib/webmock/util/parsers/json.rb
--- /tmp/20241001-2197-m46kyp 2024-10-01 02:14:45.366258829 +0000
+++ /tmp/d20241001-2197-997zf4/webmock-3.24.0/lib/webmock/util/parsers/json.rb 2024-10-01 02:14:45.364258812 +0000
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+# This is a copy of https://github.com/jnunemaker/crack/blob/master/lib/crack/json.rb
+# with date parsing removed
+# Copyright (c) 2004-2008 David Heinemeier Hansson
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require_relative "parse_error"
+
+module WebMock
+ module Util
+ module Parsers
+ class JSON
+ def self.parse(json)
+ yaml = unescape(convert_json_to_yaml(json))
+ YAML.load(yaml)
+ rescue ArgumentError, Psych::SyntaxError => e
+ raise ParseError, "Invalid JSON string: #{yaml}, Error: #{e.inspect}"
+ end
+
+ protected
+
+ def self.unescape(str)
+ str.gsub(/\\u([0-9a-f]{4})/) { [$1.hex].pack("U") }
+ end
+
+ # Ensure that ":" and "," are always followed by a space
+ def self.convert_json_to_yaml(json) #:nodoc:
+ scanner, quoting, marks, times = StringScanner.new(json), false, [], []
+ while scanner.scan_until(/(\\['"]|['":,\\]|\\.)/)
+ case char = scanner[1]
+ when '"', "'"
+ if !quoting
+ quoting = char
+ elsif quoting == char
+ quoting = false
+ end
+ when ":",","
+ marks << scanner.pos - 1 unless quoting
+ when "\\"
+ scanner.skip(/\\/)
+ end
+ end
+
+ if marks.empty?
+ json.gsub(/\\\//, '/')
+ else
+ left_pos = [-1].push(*marks)
+ right_pos = marks << json.bytesize
+ output = []
+
+ left_pos.each_with_index do |left, i|
+ if json.respond_to?(:byteslice)
+ output << json.byteslice(left.succ..right_pos[i])
+ else
+ output << json[left.succ..right_pos[i]]
+ end
+ end
+
+ output = output * " "
+
+ times.each { |i| output[i-1] = ' ' }
+ output.gsub!(/\\\//, '/')
+ output
+ end
+ end
+ end
+ end
+ end
+end
\ No newline at end of file
lib/webmock/util/parsers/parse_error.rb
--- /tmp/20241001-2197-je272a 2024-10-01 02:14:45.369258853 +0000
+++ /tmp/d20241001-2197-997zf4/webmock-3.24.0/lib/webmock/util/parsers/parse_error.rb 2024-10-01 02:14:45.364258812 +0000
@@ -0,0 +1,7 @@
+module WebMock
+ module Util
+ module Parsers
+ class ParseError < StandardError; end
+ end
+ end
+end
\ No newline at end of file
lib/webmock/util/parsers/xml.rb
--- /tmp/20241001-2197-ulu1jg 2024-10-01 02:14:45.370258862 +0000
+++ /tmp/d20241001-2197-997zf4/webmock-3.24.0/lib/webmock/util/parsers/xml.rb 2024-10-01 02:14:45.364258812 +0000
@@ -0,0 +1,16 @@
+require_relative "parse_error"
+require "crack/xml"
+
+module WebMock
+ module Util
+ module Parsers
+ class XML
+ def self.parse(xml)
+ ::Crack::XML.parse(xml)
+ rescue ::REXML::ParseException => e
+ raise ParseError, "Invalid XML string: #{xml}, Error: #{e.inspect}"
+ end
+ end
+ end
+ end
+end
* Changed:
CHANGELOG.md
--- /tmp/d20241001-2197-997zf4/webmock-3.23.1/CHANGELOG.md 2024-10-01 02:14:45.347258673 +0000
+++ /tmp/d20241001-2197-997zf4/webmock-3.24.0/CHANGELOG.md 2024-10-01 02:14:45.356258747 +0000
@@ -2,0 +3,20 @@
+# 3.24.0
+
+* Ignore parsing errors when parsing invalid JSON or XML body to match against body pattern #1066
+
+ Thanks to [Christian Schmidt](https://github.com/c960657)
+
+* Added support for mocked HTTP::Connection#finished_request? method #1065
+
+ Thanks to [Christian Schmidt](https://github.com/c960657)
+
+* Detect if Patron is loaded by checking if Patron::Session constant is defined #1068
+
+ Thanks to [Rodrigo Argumedo](https://github.com/rodrigoargumedo)
+
+* Raising an ArgumentError when uri is passed as a Pathname object to stub_request or request expectation declaration.
+
+* Dropped support for em-http-request on Ruby 3.4. The current version of em-http-request (1.1.7) is incompatible with Ruby 3.4 due to an unresolved issue (https://github.com/igrigorik/em-http-request/issues/365). Support for em-http-request will be re-enabled once the compatibility issue is resolved.
+
+ Thanks to [Christian Schmidt](https://github.com/c960657)
+
README.md
--- /tmp/d20241001-2197-997zf4/webmock-3.23.1/README.md 2024-10-01 02:14:45.348258681 +0000
+++ /tmp/d20241001-2197-997zf4/webmock-3.24.0/README.md 2024-10-01 02:14:45.357258755 +0000
@@ -1206,0 +1207,2 @@
+* Christian Schmidt
+* Rodrigo Argumedo
lib/webmock.rb
--- /tmp/d20241001-2197-997zf4/webmock-3.23.1/lib/webmock.rb 2024-10-01 02:14:45.348258681 +0000
+++ /tmp/d20241001-2197-997zf4/webmock-3.24.0/lib/webmock.rb 2024-10-01 02:14:45.357258755 +0000
@@ -7 +6,0 @@
-require 'crack/xml'
@@ -20 +19,2 @@
-require_relative 'webmock/util/json'
+require_relative 'webmock/util/parsers/json'
+require_relative 'webmock/util/parsers/xml'
lib/webmock/http_lib_adapters/async_http_client_adapter.rb
--- /tmp/d20241001-2197-997zf4/webmock-3.23.1/lib/webmock/http_lib_adapters/async_http_client_adapter.rb 2024-10-01 02:14:45.349258689 +0000
+++ /tmp/d20241001-2197-997zf4/webmock-3.24.0/lib/webmock/http_lib_adapters/async_http_client_adapter.rb 2024-10-01 02:14:45.358258763 +0000
@@ -38,3 +38,3 @@
- protocol = endpoint.protocol,
- scheme = endpoint.scheme,
- authority = endpoint.authority,
+ protocol: endpoint.protocol,
+ scheme: endpoint.scheme,
+ authority: endpoint.authority,
@@ -47,0 +48 @@
+ @endpoint = endpoint
lib/webmock/http_lib_adapters/em_http_request_adapter.rb
--- /tmp/d20241001-2197-997zf4/webmock-3.23.1/lib/webmock/http_lib_adapters/em_http_request_adapter.rb 2024-10-01 02:14:45.349258689 +0000
+++ /tmp/d20241001-2197-997zf4/webmock-3.24.0/lib/webmock/http_lib_adapters/em_http_request_adapter.rb 2024-10-01 02:14:45.358258763 +0000
@@ -2,0 +3,2 @@
+return if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.4.0')
+
lib/webmock/http_lib_adapters/http_rb/streamer.rb
--- /tmp/d20241001-2197-997zf4/webmock-3.23.1/lib/webmock/http_lib_adapters/http_rb/streamer.rb 2024-10-01 02:14:45.350258698 +0000
+++ /tmp/d20241001-2197-997zf4/webmock-3.24.0/lib/webmock/http_lib_adapters/http_rb/streamer.rb 2024-10-01 02:14:45.359258771 +0000
@@ -27,0 +28,4 @@
+ def finished_request?
+ @io.eof?
+ end
+
lib/webmock/http_lib_adapters/patron_adapter.rb
--- /tmp/d20241001-2197-997zf4/webmock-3.23.1/lib/webmock/http_lib_adapters/patron_adapter.rb 2024-10-01 02:14:45.351258706 +0000
+++ /tmp/d20241001-2197-997zf4/webmock-3.24.0/lib/webmock/http_lib_adapters/patron_adapter.rb 2024-10-01 02:14:45.360258780 +0000
@@ -9 +9 @@
-if defined?(::Patron)
+if defined?(::Patron::Session)
lib/webmock/request_pattern.rb
--- /tmp/d20241001-2197-997zf4/webmock-3.23.1/lib/webmock/request_pattern.rb 2024-10-01 02:14:45.352258714 +0000
+++ /tmp/d20241001-2197-997zf4/webmock-3.24.0/lib/webmock/request_pattern.rb 2024-10-01 02:14:45.362258796 +0000
@@ -87 +87,3 @@
- else
+ elsif uri.is_a?(::URI::Generic)
+ URIStringPattern.new(uri.to_s)
+ elsif uri.is_a?(String)
@@ -88,0 +91,2 @@
+ else
+ raise ArgumentError.new("URI should be a String, Regexp, Addressable::Template or a callable object. Got: #{uri.class}")
@@ -91 +94,0 @@
-
@@ -306 +309 @@
- WebMock::Util::JSON.parse(body)
+ WebMock::Util::Parsers::JSON.parse(body)
@@ -308 +311 @@
- Crack::XML.parse(body)
+ WebMock::Util::Parsers::XML.parse(body)
@@ -311,0 +315,2 @@
+ rescue WebMock::Util::Parsers::ParseError
+ nil
lib/webmock/version.rb
--- /tmp/d20241001-2197-997zf4/webmock-3.23.1/lib/webmock/version.rb 2024-10-01 02:14:45.356258747 +0000
+++ /tmp/d20241001-2197-997zf4/webmock-3.24.0/lib/webmock/version.rb 2024-10-01 02:14:45.365258821 +0000
@@ -4 +4 @@
- VERSION = '3.23.1' unless defined?(::WebMock::VERSION)
+ VERSION = '3.24.0' unless defined?(::WebMock::VERSION) |
dependabot
bot
force-pushed
the
dependabot/bundler/webmock-3.24.0
branch
2 times, most recently
from
ad77531
to
a1ac983
Compare
Bumps [webmock](https://github.com/bblimke/webmock) from 3.23.1 to 3.24.0. - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](bblimke/webmock@v3.23.1...v3.24.0) --- updated-dependencies: - dependency-name: webmock dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
dependabot
bot
force-pushed
the
dependabot/bundler/webmock-3.24.0
branch
from
a1ac983
to
8491e10
Compare
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.23.1 to 3.24.0.
Changelog
Sourced from webmock's changelog.
Commits
9ff63acVersion 3.24.011a3deb.gitignore .tool-versionscd84c06Merge pull request #1070 from c960657/em-http-ruby-head4fd657aWhitespace9577924Revert JRuby change9a957a2Do not speculate about em-http-request version34d1628Exclude em-http-request on Ruby 3.4f4bfa73Handle URI::Generic in RequestPattern uri276456dMerge branch 'master' of github.com:bblimke/webmock7087546Merge pull request #1068 from rodrigoargumedo/patron-fixDependabot 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)