webmock-twirp 0.5.1 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e45e4abde5e884aac42e578b3ac9ffc45cad2538d395cb8fff7bb87c391ef6fe
-  data.tar.gz: a7acf241b5cd85879bb0afa3d60c1b25dcf7f416eff3c85b58ee87224de8395a
+  metadata.gz: f44d4f0b68ccc1c1a8c71daa194f0944b99f0421c6bb6d59caada45d8bc84b74
+  data.tar.gz: 82508527da91c8c83c0429f2f2d620bea9f3b2ee830b939c5197a96419f0cc78
 SHA512:
-  metadata.gz: 57fb45deb5e5bb6d379ea3935edd84b4441561a856fea45d37bd6904953ba2a7a8fabe861bdd4d1b850c7d728d813afa018a4f9d0371581044b8a61ce5f870b0
-  data.tar.gz: facbf65f3132f690eaedebe6db9d9914182439e8519f16e5ee415fe06494e18bd8af6c675809753bbe223ca40b2b89f57fde680a47abdb34080c1d61b8c7fa95
+  metadata.gz: 83955087dd9574578f74f855a783e9608d018ae6baebcd5e651be5c39e386de1269a549db70b8c86e93567a05560c4ef38b47d797aae0d48aec7a6e6e378010e
+  data.tar.gz: 197564dee4a94728bfd9065fee7bc6c03442d24e592b4efc2dacd6ad0ffd7adfbd704ac6343aa2178aaa22ad7702191dda4d31cf4af7b54d18354a65f87491a1

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+###  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
+
 ###  v0.5.1  (2024-04-17)
 - fix rpc name matching
 

data/Gemfile.lock

@@ -1,68 +1,98 @@
 PATH
   remote: .
   specs:
-    webmock-twirp (0.5.1)
+    webmock-twirp (0.6.1)
       twirp (>= 1)
       webmock (>= 3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
-    base64 (0.2.0)
-    bigdecimal (3.1.6)
-    byebug (11.1.3)
-    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
-    diff-lcs (1.5.1)
-    docile (1.4.0)
-    faraday (2.7.11)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
-    google-protobuf (3.25.3)
-    hashdiff (1.1.0)
-    public_suffix (5.0.4)
-    rack (3.0.10)
-    rexml (3.2.6)
-    rspec (3.13.0)
+    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 (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.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.0)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.0)
-    ruby2_keywords (0.0.5)
-    simplecov (0.22.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.4)
-    twirp (1.10.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.0, >= 3.7.0)
-    webmock (3.23.0)
+      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.8.1)
+    webrick (1.9.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  byebug
+  debug
   rack
+  rake
   rspec
   simplecov
   webmock-twirp!

data/gemfiles/protobuf_3.gemfile

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

data/gemfiles/protobuf_3.gemfile.lock

@@ -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

@@ -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/request_stub.rb

@@ -77,11 +77,20 @@ module WebMock
         end
 
         request_matcher = if request
-          unless request.is_a?(Google::Protobuf::MessageExts)
-            raise TypeError, "Expected request to be Protobuf::MessageExts, found: #{request}"
+          if request.is_a?(Google::Protobuf::MessageExts)
+            # match message type and contents
+            # RSpec::Matchers::BuiltIn::Eq.new(request)
+            ->(expected, actual) { actual == expected }.curry.call(request)
+          elsif request.is_a?(Class) && request < Google::Protobuf::MessageExts
+            # match message type
+            # RSpec::Matchers::BuiltIn::BeAKindOf.new(request)
+            ->(expected, actual) { actual.is_a?(expected) }.curry.call(request)
+          elsif request.respond_to?(:matches?)
+            # is_a?(RSpec::Matchers::BuiltIn::BaseMatcher)
+            ->(expected, actual) { expected.matches?(actual) }.curry.call(request)
+          else
+            raise TypeError, "Expected request to be a Protobuf::MessageExts, found: #{request}"
           end
-
-          { body: request.to_proto }
         end
 
         # save for diffing
@@ -93,12 +102,16 @@ module WebMock
           attrs
         end
 
-        decoder = ->(request_signature) do
+        super() do |request_signature|
           matched = true
 
           request = request_signature.twirp_request
           matched &&= !!request
 
+          if request_matcher
+            matched &&= request_matcher.call(request)
+          end
+
           # match rpc_name
           if @rpc_name
             rpc_info = request_signature.twirp_rpc
@@ -119,8 +132,6 @@ module WebMock
 
           matched
         end
-
-        super(request_matcher || {}, &decoder)
       end
 
       def to_return(*responses, &block)
@@ -198,7 +209,7 @@ module WebMock
 
           obj.new
         else
-          raise ArgumentError, "can not generate twirp reponse from: #{obj}"
+          raise ArgumentError, "can not generate twirp response from: #{obj}"
         end
 
         if res.is_a?(Google::Protobuf::MessageExts)

data/lib/webmock/twirp/version.rb

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

data/webmock-twirp.gemspec

@@ -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 "byebug"
+  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

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: webmock-twirp
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.1
 platform: ruby
 authors:
 - Daniel Pepper
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
@@ -39,7 +38,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,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
@@ -109,7 +122,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Twirp support for WebMock
-email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -119,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
@@ -137,7 +151,6 @@ homepage: https://github.com/dpep/webmock-twirp
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -145,15 +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.3.26
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: WebMock::Twirp
 test_files: []