webmock-twirp 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0264d26c4984559b4163ff5740fda0df43882736fa174881a63939c195e85331
-  data.tar.gz: 9d0da633242e3f722d18c0c97042c5312b16ba4fb28fb6509479a04f5c4201eb
+  metadata.gz: b68a561786519f4bf91828a3a01e4ae803e36e03af7fd327af7780ba5da4d838
+  data.tar.gz: 151994b76bc7d4494be3f302f20633a19fdb681a092d4f1d489e694f89d43189
 SHA512:
-  metadata.gz: 369e27e257599a09541feb244e9a4c1ff59a7b069c3df154c361c6567ce8f15f0e3b46cbfb0252ebe7c72beed20cb31bb8c947857d84372aec7ae3d697e21602
-  data.tar.gz: 7aa1544321a07d5f8350203f16f331d2e9ee90b5b38928d29d1b4fb2750101109298796ff7b571684108af8aaf3c80d4b2d595a27cdef0b33715c888cb99f1cd
+  metadata.gz: b764858403de27f0b9cc28a6bddb7c827379308c1619be1b8bcbeff8d1824a3cb1c3f892644ce63c78c2bc4f1331e4fdb4a60eb88713541e0161d899a4ddaa1c
+  data.tar.gz: 43a24c5182e1aab84cbc16897faae7ea54098be328ad07e5754b939c6b89783985c23f1d565db89fa751fb5e1edb719d72a0fef264b64ae1ceadbc877e8b92d0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+###  v0.2.1  (2022-10-19)
+- fix client matching
+
+###  v0.2.0  (2022-10-17)
+- improved matching
+
 ###  v0.1.2  (2022-10-17)
 - improved matching
 - test coverage

data/README.md

@@ -1,5 +1,8 @@
 WebMock::Twirp
 ======
+![Gem](https://img.shields.io/gem/dt/webmock-twirp?style=plastic)
+[![codecov](https://codecov.io/gh/dpep/webmock-twirp/branch/main/graph/badge.svg)](https://codecov.io/gh/dpep/webmock-twirp)
+
 Twirp support for [WebMock](https://github.com/bblimke/webmock).  All our favorite http request stubbing for Twirp RPCs - message and error serialization done automatically.
 
 ###  Install
@@ -106,8 +109,3 @@ Yes please  :)
 1. Commit your changes (`git commit -am 'awesome new feature'`)
 1. Push your branch (`git push origin my-feature`)
 1. Create a Pull Request
-
-
-----
-![Gem](https://img.shields.io/gem/dt/webmock-twirp?style=plastic)
-[![codecov](https://codecov.io/gh/dpep/webmock-twirp/branch/main/graph/badge.svg)](https://codecov.io/gh/dpep/webmock-twirp)

data/lib/webmock/twirp/refinements.rb

@@ -9,10 +9,66 @@ module WebMock
 
       refine Google::Protobuf::MessageExts do
         def normalized_hash(symbolize_keys: true)
-          JSON.parse(
-            to_json(preserve_proto_fieldnames: true),
-            symbolize_names: symbolize_keys,
-          )
+          res = {}
+
+          self.class.descriptor.each do |field|
+            key = symbolize_keys ? field.name.to_sym : field.name
+            value = field.get(self)
+
+            if value.is_a?(Google::Protobuf::MessageExts)
+              # recursively serialize sub-message
+              value = value.normalized_hash(symbolize_keys: symbolize_keys)
+            end
+
+            res[key] = value unless field.default == value
+          end
+
+          res
+        end
+
+        def include?(*args)
+          expected_attrs = Hash === args.last ? args.pop : {}
+
+          # ensure all enumerated keys are present
+          return false unless args.all? { |attr| respond_to?(attr) }
+
+          # ensure all enumerated attributes are present
+          return false unless expected_attrs.keys.all? { |attr| respond_to?(attr) }
+
+          # check expected attribute matches
+          expected_attrs.all? do |expected_attr, expected_value|
+            actual_value = send(expected_attr)
+
+            matches = expected_value === actual_value
+
+            if actual_value.is_a?(Google::Protobuf::MessageExts)
+              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
+              end
+            end
+
+            matches
+          end
+        end
+
+        def match?(**attrs)
+          # ensure all enumerated keys are present
+          return false unless attrs.keys.all? { |attr| respond_to?(attr) }
+
+          # ensure each field matches
+          self.class.descriptor.all? do |field|
+            actual_value = field.get(self)
+            expected_value = attrs[field.name.to_sym]
+
+            if actual_value.is_a?(Google::Protobuf::MessageExts) && expected_value.is_a?(Hash)
+              actual_value.match?(**expected_value)
+            else
+              attrs.fetch(field.name.to_sym, field.default) === actual_value
+            end
+          end
         end
       end
     end

data/lib/webmock/twirp/request_stub.rb

@@ -21,7 +21,7 @@ module WebMock
 
         if client
           conn = client.instance_variable_get(:@conn)
-          uri += conn.url_prefix.to_s if conn
+          uri += conn.url_prefix.to_s.chomp("/") if conn
         end
 
         if klass
@@ -71,27 +71,11 @@ module WebMock
 
         decoder = ->(request) do
           input_class = rpc_from_request(request)[:input_class]
-
-          matched = true
           decoded_request = input_class.decode(request.body)
 
-          if attrs.any?
-            if defined?(RSpec::Matchers::BuiltIn::Include)
-              matcher = RSpec::Matchers::BuiltIn::Include.new(attrs)
-              attr_hash = decoded_request.to_h
-              normalize = ->{ decoded_request.normalized_hash }
-            else
-              matcher = WebMock::Matchers::HashIncludingMatcher.new(attrs)
-              attr_hash = WebMock::Util::HashKeysStringifier.stringify_keys!(decoded_request.to_h, deep: true)
-              normalize = ->{ decoded_request.normalized_hash(symbolize_keys: false) }
-            end
-
-            matched &= (matcher === attr_hash || matcher === normalize.call)
-          end
-
-          if block
-            matched &= block.call(decoded_request)
-          end
+          matched = true
+          matched &= decoded_request.include?(attrs) if attrs.any?
+          matched &= block.call(decoded_request) if block
 
           matched
         end if attrs.any? || block_given?

data/lib/webmock/twirp/version.rb

@@ -1,5 +1,5 @@
 module WebMock
   module Twirp
-    VERSION = "0.1.2"
+    VERSION = "0.2.1"
   end
 end

data/webmock-twirp.gemspec

@@ -26,6 +26,8 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "byebug"
   s.add_development_dependency "codecov"
+  s.add_development_dependency "rack"
   s.add_development_dependency "rspec"
   s.add_development_dependency "simplecov"
+  s.add_development_dependency "webrick"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webmock-twirp
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Daniel Pepper
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-17 00:00:00.000000000 Z
+date: 2022-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  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
@@ -94,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  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'
 description: Twirp support for WebMock
 email:
 executables: []