pact-support 1.14.0 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 92d18ca8bd1b86d4ae9c662ec2a44542527ea210
-  data.tar.gz: 8c7fe0d434067f498247604d32e60d0fc464d59e
+SHA256:
+  metadata.gz: 9b677a19e1ff31dc6603b612bb0e43df4f5a3f6d7922c8ea1fe6515898915f6c
+  data.tar.gz: f81ebbdc2ec57af625f095492ae60b1bf471cce4e0543d48349e0f031e6a5282
 SHA512:
-  metadata.gz: 641f9838234b355e6e0fa3303a12cdad51479ad5ecffe2d5452a9e4e573929063bb2a6fffe4451a7e804a15e4b6613a82bd9c6a08225196cfe15732e07afddb1
-  data.tar.gz: 90c860b8487295c6315b7d070b2df265d94da815eddbae30aab5c91f57a29396e4a0371d542815db00993437bde08ca95ee550e0836649a378e5a9764d05285b
+  metadata.gz: 2911a8d750ee6aa10285a7350dea230de47071f497c581aa4eb10302affcc8ab4e8b5771d7896d083ed46b8010737b39ecdbbfdaf0a408fef21f3fb6f4c03c92
+  data.tar.gz: 2d6c453ee8b51686b669e39e1fb138655a99ec6020313b72cd03e35eebbcbbcf80deabb1046808804db52c03ae565e9e6250adadb069b9e656d2fba1dd2dc3aa

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+<a name="v1.14.1"></a>
+### v1.14.1 (2020-02-27)
+
+
+#### Bug Fixes
+
+* correctly parse matching rules for request paths	 ([cc15a72](/../../commit/cc15a72))
+
+
 <a name="v1.14.0"></a>
 ### v1.14.0 (2020-02-13)
 

data/lib/pact/consumer_contract/interaction_v3_parser.rb

@@ -20,9 +20,9 @@ module Pact
         Pact.configuration.error_stream.puts("WARN: Currently only 1 provider state is supported. Ignoring ")
       end
       metadata = parse_metadata(hash['metadata'])
-      Interaction.new(symbolize_keys(hash).merge(request: request, 
-                                                 response: response, 
-                                                 provider_states: provider_states, 
+      Interaction.new(symbolize_keys(hash).merge(request: request,
+                                                 response: response,
+                                                 provider_states: provider_states,
                                                  provider_state: provider_state,
                                                  metadata: metadata))
     end
@@ -47,14 +47,14 @@ module Pact
 
     def self.parse_request_with_non_string_body request_hash, request_matching_rules, options
       request_hash = request_hash.keys.each_with_object({}) do | key, new_hash |
-        new_hash[key] = Pact::MatchingRules.merge(request_hash[key], request_matching_rules[key], options)
+        new_hash[key] = Pact::MatchingRules.merge(request_hash[key], look_up_matching_rules(key, request_matching_rules), options)
       end
       Pact::Request::Expected.from_hash(request_hash)
     end
 
     def self.parse_response_with_non_string_body response_hash, response_matching_rules, options
       response_hash = response_hash.keys.each_with_object({}) do | key, new_hash |
-        new_hash[key] = Pact::MatchingRules.merge(response_hash[key], response_matching_rules[key], options)
+        new_hash[key] = Pact::MatchingRules.merge(response_hash[key], look_up_matching_rules(key, response_matching_rules), options)
       end
       Pact::Response.from_hash(response_hash)
     end
@@ -78,5 +78,15 @@ module Pact
     def self.parse_metadata metadata_hash
       symbolize_keys(metadata_hash)
     end
+
+    def self.look_up_matching_rules(key, matching_rules)
+      # The matching rules for the path operate on the object itself and don't have sub paths
+      # Convert it into the format that Merge expects.
+      if key == 'path'
+        matching_rules[key] ? { '$.' => matching_rules[key] } : nil
+      else
+        matching_rules[key]
+      end
+    end
   end
 end

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "1.14.0"
+    VERSION = "1.14.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.1
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -299,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Shared code for Pact gems