pact-support 1.16.0 → 1.16.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6a279f056179dc2383e86277a08e0ee5436601e14462e646c74d5188f8f3926
-  data.tar.gz: 18a96a0b5b1108054a976704e33ab7e6127da3dcc84b470d869dff5127b6275f
+  metadata.gz: 4e0c625aaae1df3561bcc4931619c302e86e7a095532a796ccbb0d72c25fa1a0
+  data.tar.gz: 5cecf64f0fcdd42ba68cd87fe117a3de729b96f1cd22ae4f47dcb171f78c0fc0
 SHA512:
-  metadata.gz: 8f3e75f12fc938510916fc09c5de54caeebeaa1e2067165ef1761114f2100a3b8f07f8d7a103b78becdcfc9fe30a2b3539b4170c42e4b223c7a0a16269e061b1
-  data.tar.gz: 950d8ab96d8e9d755a663072967f21ac6a71c9d99de1205b47fe4c05794a68c733473a6810319a0777c10f9ec196257b3ebe6b6677c830abb336503298855015
+  metadata.gz: dcb61af6781e17f964725fdd44452c3fa63b146bc71240c5a2cff6580d7572da316e41af133d4c9ac814d2a8200a72b250e32333292567718c43fbee88aaf3c0
+  data.tar.gz: 661cf6909d54987e5e9e63ba38ce2b92ac00c2823853ac178670a204ce80adf96084c9665cf622f7a04ce2e50e7948b755c07ffc0d14e344492908bb033966d8

data/CHANGELOG.md

@@ -1,3 +1,38 @@
+<a name="v1.16.5"></a>
+### v1.16.5 (2020-11-25)
+
+#### Bug Fixes
+
+* maintain the original string query for the provider verification while also parsing the string query into a hash to allow the matching rules to be applied correctly for use in the mock service on the consumer side	 ([12105dd](/../../commit/12105dd))
+
+<a name="v1.16.4"></a>
+### v1.16.4 (2020-11-13)
+
+#### Bug Fixes
+
+* ensure expected and actual query strings are parsed consistently	 ([4e9ca9c](/../../commit/4e9ca9c))
+
+<a name="v1.16.3"></a>
+### v1.16.3 (2020-11-10)
+
+#### Bug Fixes
+
+* add missing params_hash_has_key	 ([700efa7](/../../commit/700efa7))
+
+<a name="v1.16.2"></a>
+### v1.16.2 (2020-11-07)
+
+#### Bug Fixes
+
+* removed undefined depth from query	 ([53a373d](/../../commit/53a373d))
+
+<a name="v1.16.1"></a>
+### v1.16.1 (2020-11-06)
+
+#### Bug Fixes
+
+* add missing params_hash_type? from Rack	 ([3195b0a](/../../commit/3195b0a))
+
 <a name="v1.16.0"></a>
 ### v1.16.0 (2020-11-04)
 

data/README.md

@@ -1,5 +1,5 @@
 # Pact Support
 
-[![Build Status](https://travis-ci.org/pact-foundation/pact-support.svg?branch=master)](https://travis-ci.org/pact-foundation/pact-support)
+[![Build Status](https://travis-ci.com/pact-foundation/pact-support.svg?branch=master)](https://travis-ci.com/pact-foundation/pact-support)
 
 Provides shared code for the Pact gems

data/lib/pact/consumer_contract/interaction_v2_parser.rb

@@ -23,12 +23,22 @@ module Pact
     end
 
     def self.parse_request request_hash, options
-      if request_hash['query'].is_a?(String)
+      original_query_string = request_hash['query']
+      query_is_string = original_query_string.is_a?(String)
+      if query_is_string
         request_hash = request_hash.dup
         request_hash['query'] = Pact::Query.parse_string(request_hash['query'])
       end
+      # The query has to be a hash at this stage for the matching rules to be applied
       request_hash = Pact::MatchingRules.merge(request_hash, request_hash['matchingRules'], options)
-      Pact::Request::Expected.from_hash(request_hash)
+      # The original query string needs to be passed in to the constructor so it can be used
+      # when the request is replayed. Otherwise, we loose the square brackets because they get lost
+      # in the translation between string => structured object, as we don't know/store which
+      # query string convention was used.
+      if query_is_string
+        request_hash['query'] = Pact::QueryHash.new(request_hash['query'], original_query_string)
+      end
+      request = Pact::Request::Expected.from_hash(request_hash)
     end
 
     def self.parse_response response_hash, options

data/lib/pact/consumer_contract/query.rb

@@ -14,11 +14,15 @@ module Pact
       end
     end
 
+    def self.is_a_query_object?(object)
+      object.is_a?(Pact::QueryHash) || object.is_a?(Pact::QueryString)
+    end
+
     def self.parse_string query_string
       parsed_query = parse_query(query_string)
 
       # If Rails nested params...
-      if parsed_query.keys.any?{ | key| key.include?("[") }
+      if parsed_query.keys.any?{ | key| key =~ /\[.*\]/ }
         parse_nested_query(query_string)
       else
         parsed_query.each_with_object({}) do | (key, value), new_hash |
@@ -99,12 +103,28 @@ module Pact
       else
         params[k] ||= {}
         raise ParameterTypeError, "expected Hash (got #{params[k].class.name}) for param `#{k}'" unless params_hash_type?(params[k])
-        params[k] = normalize_params(params[k], after, v, depth - 1)
+        params[k] = normalize_params(params[k], after, v)
       end
 
       params
     end
 
+    def self.params_hash_type?(obj)
+      obj.is_a?(Hash)
+    end
+
+    def self.params_hash_has_key?(hash, key)
+      return false if key =~ /\[\]/
+
+      key.split(/[\[\]]+/).inject(hash) do |h, part|
+        next h if part == ''
+        return false unless params_hash_type?(h) && h.key?(part)
+        h[part]
+      end
+
+      true
+    end
+
     def self.unescape(s, encoding = Encoding::UTF_8)
       URI.decode_www_form_component(s, encoding)
     end

data/lib/pact/consumer_contract/query_hash.rb

@@ -8,8 +8,11 @@ module Pact
     include ActiveSupportSupport
     include SymbolizeKeys
 
-    def initialize(query)
+    attr_reader :original_string
+
+    def initialize(query, original_string = nil)
       @hash = query.nil? ? query : convert_to_hash_of_arrays(query)
+      @original_string = original_string
     end
 
     def as_json(opts = {})
@@ -32,7 +35,7 @@ module Pact
     # from the actual query string.
     def difference(other)
       require 'pact/matchers' # avoid recursive loop between this file, pact/reification and pact/matchers
-      Pact::Matchers.diff(query, symbolize_keys(CGI::parse(other.query)), allow_unexpected_keys: false)
+      Pact::Matchers.diff(query, symbolize_keys(convert_to_hash_of_arrays(Query.parse_string(other.query))), allow_unexpected_keys: false)
     end
 
     def query

data/lib/pact/reification.rb

@@ -27,15 +27,19 @@ module Pact
       when Pact::QueryString
         from_term(term.query)
       when Pact::QueryHash
-        from_term(term.query).map { |k, v|
-          if v.nil?
-            k
-          elsif v.is_a?(Array) #For cases where there are multiple instance of the same parameter
-            v.map { |x| "#{k}=#{escape(x)}"}.join('&')
-          else
-            "#{k}=#{escape(v)}"
-          end
-        }.join('&')
+        if term.original_string
+          term.original_string
+        else
+          from_term(term.query).map { |k, v|
+            if v.nil?
+              k
+            elsif v.is_a?(Array) #For cases where there are multiple instance of the same parameter
+              v.map { |x| "#{k}=#{escape(x)}"}.join('&')
+            else
+              "#{k}=#{escape(v)}"
+            end
+          }.join('&')
+        end
       when Pact::StringWithMatchingRules
         String.new(term)
       else

data/lib/pact/shared/request.rb

@@ -3,9 +3,7 @@ require 'pact/consumer_contract/headers'
 require 'pact/consumer_contract/query'
 
 module Pact
-
   module Request
-
     class Base
       include Pact::SymbolizeKeys
 
@@ -16,7 +14,7 @@ module Pact
         @path = path
         @headers = Hash === headers ? Headers.new(headers) : headers # Could be a NullExpectation - TODO make this more elegant
         @body = body
-        @query = is_unspecified?(query) ? query : Pact::Query.create(query)
+        set_query(query)
       end
 
       def to_hash
@@ -92,6 +90,17 @@ module Pact
         (query.nil? || query.empty?) ? '' : "?#{Pact::Reification.from_term(query)}"
       end
 
+      def set_query(query)
+        @query = if is_unspecified?(query)
+          query
+        else
+          if Pact::Query.is_a_query_object?(query)
+            query
+          else
+            Pact::Query.create(query)
+          end
+        end
+      end
     end
   end
-end
+end

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "1.16.0"
+    VERSION = "1.16.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.16.5
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -96,14 +96,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement