webmock-twirp 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 944a35bac7c3e752f543bc37f6d2b0a66a1a7f771022ac28c9c30ddba2e92891
-  data.tar.gz: db6bfad348186e05d483d6d09c485fd470679e3978fcca131e93d5fcee6649de
+  metadata.gz: 0264d26c4984559b4163ff5740fda0df43882736fa174881a63939c195e85331
+  data.tar.gz: 9d0da633242e3f722d18c0c97042c5312b16ba4fb28fb6509479a04f5c4201eb
 SHA512:
-  metadata.gz: 7b7fb99d4bf12cad35620ef9bb22bd7faabd626254c6e5a307b27da7478091eaf88256d0fc902cb507311312837c52ecc0b238796cedc0153674dbb34db69308
-  data.tar.gz: 8f4bf9c6f3b828843e2cc8167c4b47e7ccda55a56dda1c678f5b1cf7e2b0eba01207e71572d08e13004e7c031f5ef950160f61a907ffffefbbec862be7d1918b
+  metadata.gz: 369e27e257599a09541feb244e9a4c1ff59a7b069c3df154c361c6567ce8f15f0e3b46cbfb0252ebe7c72beed20cb31bb8c947857d84372aec7ae3d697e21602
+  data.tar.gz: 7aa1544321a07d5f8350203f16f331d2e9ee90b5b38928d29d1b4fb2750101109298796ff7b571684108af8aaf3c80d4b2d595a27cdef0b33715c888cb99f1cd

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+###  v0.1.2  (2022-10-17)
+- improved matching
+- test coverage
+
 ###  v0.1.1  (2022-10-11)
 - test coverage
 - error messages

data/lib/webmock/twirp/refinements.rb

@@ -6,6 +6,15 @@ module WebMock
           find(&block)&.tap { |x| delete(x) }
         end
       end
+
+      refine Google::Protobuf::MessageExts do
+        def normalized_hash(symbolize_keys: true)
+          JSON.parse(
+            to_json(preserve_proto_fieldnames: true),
+            symbolize_names: symbolize_keys,
+          )
+        end
+      end
     end
   end
 end

data/lib/webmock/twirp/request_stub.rb

@@ -76,10 +76,17 @@ module WebMock
           decoded_request = input_class.decode(request.body)
 
           if attrs.any?
-            attr_matcher = Matchers::HashIncludingMatcher.new(**attrs)
-            attr_hash = WebMock::Util::HashKeysStringifier.stringify_keys!(decoded_request.to_h, deep: true)
+            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 &= attr_matcher === attr_hash
+            matched &= (matcher === attr_hash || matcher === normalize.call)
           end
 
           if block

data/lib/webmock/twirp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webmock-twirp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Daniel Pepper
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock