pact-support 1.16.3 → 1.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21b34941c3f361a8b7de218ebbbcd6327da07bdbc751a44a05fec1a3b9c1c54b
-  data.tar.gz: 7b0fa37d00fcafe3850b22ce19657e1cbef146d3d9ee77d1cc92503376409289
+  metadata.gz: c13a4b7ad88f078970d7e0991fc8e7406a20267b038d67b3c583003b3b18814e
+  data.tar.gz: f72c487f5e7f11a5d6db48812028130487d0a0d4a9ac1f8c2726bf5d8d487d4c
 SHA512:
-  metadata.gz: aa6230402d114538c81e6d1a90bed0267f86a21a18e9bda1cd75545a8853e9bebce1b1babb965e2eb07a50cb863f9c2567720f31efd884e3aeca8d74cd442094
-  data.tar.gz: 7b35d7033cba46c342f0eba471e5bbb3409875a9715fed8e4033903e1332d601d449d505b9d0ebd9ae789607abcdf8398cae4df65b9834542407c29c83b451ff
+  metadata.gz: 985481757b4ec8880946efceb5929aceb818defcd80233ef908ed0cb8f55ed4e8ceb6c9f6e89cee4856dd581fd42dca4b6dc1d244dc9dece6a51fffe456c6915
+  data.tar.gz: 8c5bfdc029b6461fb80a64089ef1d003f3dc0f93d2677020c37f9bd733423e1e976058f14199b2d8dcc36e5a648450d786d91a6fb215dbef0aab1e453c56d52a

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+<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)
 

data/lib/pact/consumer_contract/query.rb

@@ -18,7 +18,7 @@ module Pact
       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 |
@@ -110,7 +110,7 @@ module Pact
     end
 
     def self.params_hash_has_key?(hash, key)
-      return false if /\[\]/.match?(key)
+      return false if key =~ /\[\]/
 
       key.split(/[\[\]]+/).inject(hash) do |h, part|
         next h if part == ''

data/lib/pact/consumer_contract/query_hash.rb

@@ -32,7 +32,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/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
 
@@ -91,7 +89,6 @@ module Pact
       def display_query
         (query.nil? || query.empty?) ? '' : "?#{Pact::Reification.from_term(query)}"
       end
-
     end
   end
-end
+end

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "1.16.3"
+    VERSION = "1.16.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 1.16.3
+  version: 1.16.4
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp