pact-support 1.15.5 → 1.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eced331decdf4981868c618a63d43239d7a2bb819272d7b64079fc1eb56b952b
-  data.tar.gz: c09a587cba454b5b2a10f836d405e3c395a008e213fbef930ae4f7898d38fcb1
+  metadata.gz: c13a4b7ad88f078970d7e0991fc8e7406a20267b038d67b3c583003b3b18814e
+  data.tar.gz: f72c487f5e7f11a5d6db48812028130487d0a0d4a9ac1f8c2726bf5d8d487d4c
 SHA512:
-  metadata.gz: f26c19bd7e36e3d9a037e2951711ea4d895bf578cb2156418457bdf36ac95a19a5a9e7dcc78c29a73dd32ad5f733167368e9d0e095b97266c97018d117b91474
-  data.tar.gz: 8dd47965327e6475cb54aebae53b3e2f0286c7338ffd3fdbd26cb8bb9dced3e5fac034dd2ad3e6e83f8a8cebc63a374affb8b87ccbae505d664e909909c8f23b
+  metadata.gz: 985481757b4ec8880946efceb5929aceb818defcd80233ef908ed0cb8f55ed4e8ceb6c9f6e89cee4856dd581fd42dca4b6dc1d244dc9dece6a51fffe456c6915
+  data.tar.gz: 8c5bfdc029b6461fb80a64089ef1d003f3dc0f93d2677020c37f9bd733423e1e976058f14199b2d8dcc36e5a648450d786d91a6fb215dbef0aab1e453c56d52a

data/CHANGELOG.md

@@ -1,3 +1,38 @@
+<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)
+
+#### Features
+
+* remove runtime dependency on rspec	 ([aca30e2](/../../commit/aca30e2))
+
 <a name="v1.15.5"></a>
 ### v1.15.5 (2020-11-04)
 

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 |
@@ -99,12 +99,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

@@ -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/rspec.rb

@@ -1,4 +1,3 @@
-require 'rspec'
 # This is horrible, must work out a better way of doing this
 module Pact
   module RSpec
@@ -19,7 +18,6 @@ module Pact
         require 'pact/provider/rspec/formatter_rspec_2'
         Pact::Provider::RSpec::Formatter2
       end
-
     end
 
     def self.full_description example
@@ -31,11 +29,11 @@ module Pact
     end
 
     def self.is_rspec_3
-      ::RSpec::Core::Formatters.respond_to?(:register)
+      defined?(::RSpec) && ::RSpec::Core::Formatters.respond_to?(:register)
     end
 
     def self.is_rspec_2
-      !is_rspec_3
+      defined?(::RSpec) && !is_rspec_3
     end
 
     def self.with_rspec_3

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.15.5"
+    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.15.5
+  version: 1.16.4
 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-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -28,20 +28,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.7
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.14'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +70,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement