RubyGems - webmock-twirp - Versions diffs - 0.6.0 → 0.6.1 - Mend

webmock-twirp 0.6.0 → 0.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +4 -0
data/Gemfile.lock +49 -43
data/gemfiles/protobuf_3.gemfile +5 -0
data/gemfiles/protobuf_3.gemfile.lock +101 -0
data/lib/webmock/twirp/refinements.rb +20 -2
data/lib/webmock/twirp/version.rb +1 -1
data/webmock-twirp.gemspec +5 -5
metadata +20 -4

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d2e3419ce5ddc60c10c14e7cb33e806b6ee92c0f93787b5209a0e3eeb47638e
-  data.tar.gz: 84b5215a00b57a531f24fde3298b0720bba7de7fd0553523af3ac3bd3df83cbf
+  metadata.gz: f44d4f0b68ccc1c1a8c71daa194f0944b99f0421c6bb6d59caada45d8bc84b74
+  data.tar.gz: 82508527da91c8c83c0429f2f2d620bea9f3b2ee830b939c5197a96419f0cc78
 SHA512:
-  metadata.gz: 59acbce84012d937a66f6fe601a2ec0b49f9a56c384113c35371362b603907f201dea384f54e343e8759b9b397c732f8c03e185d2a72ab88f7bfb33ba5e3fa4b
-  data.tar.gz: 536a0a49c744b98d3973e56c18e02ec0e968f14f71639ee4164808b6a07f545a6df416ee1b7e36b11bf877e8febad5163b634fe10a4d7fc3bfe9ddf6c1624f52
+  metadata.gz: 83955087dd9574578f74f855a783e9608d018ae6baebcd5e651be5c39e386de1269a549db70b8c86e93567a05560c4ef38b47d797aae0d48aec7a6e6e378010e
+  data.tar.gz: 197564dee4a94728bfd9065fee7bc6c03442d24e592b4efc2dacd6ad0ffd7adfbd704ac6343aa2178aaa22ad7702191dda4d31cf4af7b54d18354a65f87491a1

data/CHANGELOG.md CHANGED Viewed

@@ -1,3 +1,7 @@
+###  0.6.1  (2026-11-08)
+- Requires Ruby 3.2 or newer.
+- Fix nested matchers like `with(date: include(year: 0))` not matching default-valued fields on google-protobuf 4.
 ###  0.6.0  (2025-02-11)
 - rspec matcher support
 - debug gem

data/Gemfile.lock CHANGED Viewed

@@ -1,85 +1,90 @@
 PATH
   remote: .
   specs:
-    webmock-twirp (0.6.0)
+    webmock-twirp (0.6.1)
       twirp (>= 1)
       webmock (>= 3)
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
-    bigdecimal (3.1.9)
-    crack (1.0.0)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
+    bigdecimal (4.1.3)
+    cgi (0.5.1)
+    crack (1.0.1)
       bigdecimal
       rexml
-    date (3.4.1)
-    debug (1.10.0)
+    date (3.5.1)
+    debug (1.11.1)
       irb (~> 1.10)
       reline (>= 0.3.8)
-    diff-lcs (1.5.1)
-    docile (1.4.1)
-    faraday (2.12.1)
+    diff-lcs (1.6.2)
+    erb (4.0.4.1)
+      cgi (>= 0.3.3)
+    faraday (2.14.3)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.0)
-      net-http (>= 0.5.0)
-    google-protobuf (3.25.3)
-    hashdiff (1.1.2)
-    io-console (0.8.0)
-    irb (1.15.1)
+    faraday-net_http (3.4.4)
+      net-http (~> 0.5)
+    google-protobuf (4.36.2)
+      bigdecimal
+      rake (~> 13.3)
+    hashdiff (1.2.1)
+    io-console (0.8.2)
+    irb (1.18.0)
       pp (>= 0.6.0)
+      prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.9.0)
-    logger (1.6.2)
-    net-http (0.6.0)
-      uri
-    pp (0.6.2)
+    json (2.19.9)
+    logger (1.7.0)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
+    pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
-    psych (5.2.3)
+    prism (1.9.0)
+    psych (5.3.1)
       date
       stringio
-    public_suffix (6.0.1)
-    rack (3.1.9)
-    rdoc (6.12.0)
+    public_suffix (6.0.2)
+    rack (3.2.8)
+    rake (13.4.2)
+    rdoc (7.2.0)
+      erb
       psych (>= 4.0.0)
-    reline (0.6.0)
+      tsort
+    reline (0.6.3)
       io-console (~> 0.5)
-    rexml (3.4.0)
-    rspec (3.13.0)
+    rexml (3.4.4)
+    rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.2)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.2)
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.1)
-    simplecov_json_formatter (0.1.4)
-    stringio (3.1.2)
-    twirp (1.13.0)
+    rspec-support (3.13.7)
+    simplecov (1.2.0)
+    stringio (3.2.0)
+    tsort (0.2.0)
+    twirp (1.13.1)
       faraday (< 3)
       google-protobuf (>= 3.25, < 5.a)
       rack (>= 2.2.3)
-    uri (1.0.2)
-    webmock (3.25.0)
+    uri (1.1.1)
+    webmock (3.34.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.9.1)
+    webrick (1.9.2)
 PLATFORMS
   ruby
@@ -87,6 +92,7 @@ PLATFORMS
 DEPENDENCIES
   debug
   rack
+  rake
   rspec
   simplecov
   webmock-twirp!

data/gemfiles/protobuf_3.gemfile ADDED Viewed

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+gemspec path: ".."
+gem "google-protobuf", "~> 3.25"

data/gemfiles/protobuf_3.gemfile.lock ADDED Viewed

@@ -0,0 +1,101 @@
+PATH
+  remote: ..
+  specs:
+    webmock-twirp (0.6.1)
+      twirp (>= 1)
+      webmock (>= 3)
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
+    bigdecimal (4.1.3)
+    cgi (0.5.1)
+    crack (1.0.1)
+      bigdecimal
+      rexml
+    date (3.5.1)
+    debug (1.11.1)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
+    diff-lcs (1.6.2)
+    erb (4.0.4.1)
+      cgi (>= 0.3.3)
+    faraday (2.14.3)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-net_http (3.4.4)
+      net-http (~> 0.5)
+    google-protobuf (3.25.5)
+    hashdiff (1.2.1)
+    io-console (0.8.2)
+    irb (1.18.0)
+      pp (>= 0.6.0)
+      prism (>= 1.3.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.19.9)
+    logger (1.7.0)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
+    pp (0.6.3)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.9.0)
+    psych (5.3.1)
+      date
+      stringio
+    public_suffix (6.0.2)
+    rack (3.2.8)
+    rake (13.4.2)
+    rdoc (7.2.0)
+      erb
+      psych (>= 4.0.0)
+      tsort
+    reline (0.6.3)
+      io-console (~> 0.5)
+    rexml (3.4.4)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.8)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
+    simplecov (1.2.0)
+    stringio (3.2.0)
+    tsort (0.2.0)
+    twirp (1.13.1)
+      faraday (< 3)
+      google-protobuf (>= 3.25, < 5.a)
+      rack (>= 2.2.3)
+    uri (1.1.1)
+    webmock (3.34.0)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.2)
+PLATFORMS
+  ruby
+DEPENDENCIES
+  debug
+  google-protobuf (~> 3.25)
+  rack
+  rake
+  rspec
+  simplecov
+  webmock-twirp!
+  webrick
+BUNDLED WITH
+   2.4.20

data/lib/webmock/twirp/refinements.rb CHANGED Viewed

@@ -1,6 +1,25 @@
 module WebMock
   module Twirp
     module Refinements
+      # Message#to_h, but keeping default-valued fields, which google-protobuf 4 drops
+      def self.to_h_with_defaults(value)
+        case value
+        when Google::Protobuf::MessageExts
+          value.class.descriptor.to_h do |field|
+            [ field.name.to_sym, to_h_with_defaults(field.get(value)) ]
+          end
+        when Google::Protobuf::RepeatedField
+          value.map { |x| to_h_with_defaults(x) }
+        when Google::Protobuf::Map
+          # Map#to_h ignores a block
+          res = {}
+          value.each { |k, v| res[k] = to_h_with_defaults(v) }
+          res
+        else
+          value
+        end
+      end
       refine Array do
         def snag(&block)
           find(&block)&.tap { |x| delete(x) }
@@ -45,8 +64,7 @@ module WebMock
               if expected_value.is_a?(Hash)
                 matches ||= actual_value.match?(**expected_value)
               else
-                matches ||= expected_value === actual_value.to_h
-                # matches ||= expected_value === actual_value.normalized_hash
+                matches ||= expected_value === Refinements.to_h_with_defaults(actual_value)
               end
             end

data/lib/webmock/twirp/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module WebMock
   module Twirp
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

data/webmock-twirp.gemspec CHANGED Viewed

@@ -1,5 +1,4 @@
 require_relative "lib/webmock/twirp/version"
-package = WebMock::Twirp
 Gem::Specification.new do |s|
   s.authors     = ["Daniel Pepper"]
@@ -7,17 +6,18 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files * ':!:spec'`.split("\n")
   s.homepage    = "https://github.com/dpep/webmock-twirp"
   s.license     = "MIT"
-  s.name        = File.basename(__FILE__).split(".")[0]
-  s.summary     = package.to_s
-  s.version     = package.const_get "VERSION"
+  s.name        = "webmock-twirp"
+  s.summary     = "WebMock::Twirp"
+  s.version     = WebMock::Twirp::VERSION
-  s.required_ruby_version = ">= 3"
+  s.required_ruby_version = ">= 3.2"
   s.add_dependency "webmock", ">= 3"
   s.add_dependency "twirp", ">= 1"
   s.add_development_dependency "debug"
   s.add_development_dependency "rack"
+  s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "webrick"

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: webmock-twirp
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Daniel Pepper
 bindir: bin
 cert_chain: []
-date: 2025-02-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
@@ -65,6 +65,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +131,8 @@ files:
 - Gemfile.lock
 - LICENSE.txt
 - README.md
+- gemfiles/protobuf_3.gemfile
+- gemfiles/protobuf_3.gemfile.lock
 - lib/webmock-twirp.rb
 - lib/webmock/twirp.rb
 - lib/webmock/twirp/error.rb
@@ -142,14 +158,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: WebMock::Twirp
 test_files: []