webmock-twirp 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbad5503c5dd1bde8669aecc1119f73c79b709ac1cb6075c664866ecd9d2f27c
-  data.tar.gz: 7c3ee3cb14d758a6d4a75abefd6d4a87301a2176baa351f78339532252944f2d
+  metadata.gz: 4d2e3419ce5ddc60c10c14e7cb33e806b6ee92c0f93787b5209a0e3eeb47638e
+  data.tar.gz: 84b5215a00b57a531f24fde3298b0720bba7de7fd0553523af3ac3bd3df83cbf
 SHA512:
-  metadata.gz: f185ac5c5a58f9188770b0ac787ef5d11c1a1d665b1f8cc1e33befcd27399b60adc645df990caa2368fbd354eec224397f63f06c1154d3039db487cc555193ea
-  data.tar.gz: d24dd405de783c33a2a7c5aba2fe27a8208bccd1b613c91cb75618103a54437e1e88bdb609efaddfe89ebdb0b197c876bb305c8475f753c925e010ca35c5c35a
+  metadata.gz: 59acbce84012d937a66f6fe601a2ec0b49f9a56c384113c35371362b603907f201dea384f54e343e8759b9b397c732f8c03e185d2a72ab88f7bfb33ba5e3fa4b
+  data.tar.gz: 536a0a49c744b98d3973e56c18e02ec0e968f14f71639ee4164808b6a07f545a6df416ee1b7e36b11bf877e8febad5163b634fe10a4d7fc3bfe9ddf6c1624f52

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+###  0.6.0  (2025-02-11)
+- rspec matcher support
+- debug gem
+
+###  v0.5.1  (2024-04-17)
+- fix rpc name matching
+
 ###  v0.5.0  (2024-04-07)
 - codecov upgrade
 - drop ruby 2.7 (#65)

data/Gemfile.lock

@@ -1,67 +1,91 @@
 PATH
   remote: .
   specs:
-    webmock-twirp (0.5.0)
+    webmock-twirp (0.6.0)
       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)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    bigdecimal (3.1.9)
     crack (1.0.0)
       bigdecimal
       rexml
+    date (3.4.1)
+    debug (1.10.0)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
     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)
+    docile (1.4.1)
+    faraday (2.12.1)
+      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.0)
-    public_suffix (5.0.4)
-    rack (3.0.10)
-    rexml (3.2.6)
+    hashdiff (1.1.2)
+    io-console (0.8.0)
+    irb (1.15.1)
+      pp (>= 0.6.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)
+      prettyprint
+    prettyprint (0.2.0)
+    psych (5.2.3)
+      date
+      stringio
+    public_suffix (6.0.1)
+    rack (3.1.9)
+    rdoc (6.12.0)
+      psych (>= 4.0.0)
+    reline (0.6.0)
+      io-console (~> 0.5)
+    rexml (3.4.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.0)
-    ruby2_keywords (0.0.5)
+    rspec-support (3.13.2)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    twirp (1.10.0)
+    stringio (3.1.2)
+    twirp (1.13.0)
       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.0.2)
+    webmock (3.25.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.8.1)
+    webrick (1.9.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  byebug
+  debug
   rack
   rspec
   simplecov

data/lib/webmock/twirp/request_stub.rb

@@ -61,14 +61,7 @@ module WebMock
           # match rpc dynamically after client resolves
           @rpc_name = rpc_name
 
-          @request_pattern.with do |request|
-            rpc_info = request.twirp_rpc
-
-            !!rpc_info && (
-              rpc_info[:rpc_method] == rpc_name ||
-              rpc_info[:ruby_method] == rpc_name
-            )
-          end
+          with
         end
       end
 
@@ -84,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
@@ -100,12 +102,26 @@ 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
+
+            matched &&= !!rpc_info && (
+              rpc_info[:rpc_method] == @rpc_name ||
+              rpc_info[:ruby_method] == @rpc_name
+            )
+          end
+
           # match request attributes
           if attrs.any?
             matched &&= request.include?(attrs)
@@ -116,8 +132,6 @@ module WebMock
 
           matched
         end
-
-        super(request_matcher || {}, &decoder)
       end
 
       def to_return(*responses, &block)
@@ -195,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.0"
+    VERSION = "0.6.0"
   end
 end

data/webmock-twirp.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   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 "rspec"
   s.add_development_dependency "simplecov"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: webmock-twirp
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Daniel Pepper
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-07 00:00:00.000000000 Z
+date: 2025-02-11 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:
     - - ">="
@@ -109,7 +108,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Twirp support for WebMock
-email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -137,7 +135,6 @@ homepage: https://github.com/dpep/webmock-twirp
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -152,8 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.7
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: WebMock::Twirp
 test_files: []