pact-support 1.15.1 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ccc117840bc0955cb8ffa7568bab96b94ec5d7d51b6bd5233a05b251373e221
-  data.tar.gz: 66218c13f81e23f76facec82ef95f64038376f3368ae02aa3ce16008288f35fe
+  metadata.gz: d6a279f056179dc2383e86277a08e0ee5436601e14462e646c74d5188f8f3926
+  data.tar.gz: 18a96a0b5b1108054a976704e33ab7e6127da3dcc84b470d869dff5127b6275f
 SHA512:
-  metadata.gz: 4e16a0adf65d235937a123a5a1ee0043ded52ba0e4a2541f6b3a7a0e5e208a681cb405baee555b23c66d46a75dcb388999d1f424b0c7bb9c8055839cbf72f9ac
-  data.tar.gz: 0dc8fef0d02eaeb5976395c4a0eb33bdc01ac0ba954dad0eab3a7bc8b24d31625224e28c048d31b551ff1bc15a39ba41bd0f275a80f8d578f9077f0193fdfcb0
+  metadata.gz: 8f3e75f12fc938510916fc09c5de54caeebeaa1e2067165ef1761114f2100a3b8f07f8d7a103b78becdcfc9fe30a2b3539b4170c42e4b223c7a0a16269e061b1
+  data.tar.gz: 950d8ab96d8e9d755a663072967f21ac6a71c9d99de1205b47fe4c05794a68c733473a6810319a0777c10f9ec196257b3ebe6b6677c830abb336503298855015

data/CHANGELOG.md

@@ -1,3 +1,44 @@
+<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)
+
+#### Bug Fixes
+
+* add missing outputs to release workflow	 ([d565d0f](/../../commit/d565d0f))
+* try different output syntax	 ([b11e8fb](/../../commit/b11e8fb))
+
+<a name="v1.15.4"></a>
+### v1.15.4 (2020-11-04)
+
+#### Bug Fixes
+
+* update release gem action version	 ([9dead58](/../../commit/9dead58))
+
+<a name="v1.15.3"></a>
+### v1.15.3 (2020-11-04)
+
+
+#### Bug Fixes
+
+* release workflow	 ([4bdf8d8](/../../commit/4bdf8d8))
+* not actually a fix, just triggering new release	 ([74038a5](/../../commit/74038a5))
+
+
+<a name="v1.15.2"></a>
+### v1.15.2 (2020-11-04)
+
+
+#### Bug Fixes
+
+* parse query string to hash for v2 interactions	 ([faff17c](/../../commit/faff17c))
+
+
 <a name="v1.15.0"></a>
 ### v1.15.0 (2020-04-30)
 

data/lib/pact/consumer_contract/interaction_v2_parser.rb

@@ -1,6 +1,7 @@
 require 'pact/consumer_contract/request'
 require 'pact/consumer_contract/response'
 require 'pact/consumer_contract/provider_state'
+require 'pact/consumer_contract/query'
 require 'pact/symbolize_keys'
 require 'pact/matching_rules'
 require 'pact/errors'
@@ -15,13 +16,17 @@ module Pact
       response = parse_response(hash['response'], options)
       provider_states = parse_provider_states(hash['providerState'] || hash['provider_state'])
       metadata = parse_metadata(hash['metadata'])
-      Interaction.new(symbolize_keys(hash).merge(request: request, 
-                                                 response: response, 
+      Interaction.new(symbolize_keys(hash).merge(request: request,
+                                                 response: response,
                                                  provider_states: provider_states,
                                                  metadata: metadata))
     end
 
     def self.parse_request request_hash, options
+      if request_hash['query'].is_a?(String)
+        request_hash = request_hash.dup
+        request_hash['query'] = Pact::Query.parse_string(request_hash['query'])
+      end
       request_hash = Pact::MatchingRules.merge(request_hash, request_hash['matchingRules'], options)
       Pact::Request::Expected.from_hash(request_hash)
     end

data/lib/pact/consumer_contract/query.rb

@@ -3,6 +3,9 @@ require 'pact/consumer_contract/query_string'
 
 module Pact
   class Query
+    DEFAULT_SEP = /[&;] */n
+    COMMON_SEP = { ";" => /[;] */n, ";," => /[;,] */n, "&" => /[&] */n }
+
     def self.create query
       if query.is_a? Hash
         Pact::QueryHash.new(query)
@@ -10,5 +13,100 @@ module Pact
         Pact::QueryString.new(query)
       end
     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?("[") }
+        parse_nested_query(query_string)
+      else
+        parsed_query.each_with_object({}) do | (key, value), new_hash |
+          new_hash[key] = [*value]
+        end
+      end
+    end
+
+    # Ripped from Rack to avoid adding an unnecessary dependency, thank you Rack
+    # https://github.com/rack/rack/blob/649c72bab9e7b50d657b5b432d0c205c95c2be07/lib/rack/utils.rb
+    def self.parse_query(qs, d = nil, &unescaper)
+      unescaper ||= method(:unescape)
+
+      params = {}
+
+      (qs || '').split(d ? (COMMON_SEP[d] || /[#{d}] */n) : DEFAULT_SEP).each do |p|
+        next if p.empty?
+        k, v = p.split('=', 2).map!(&unescaper)
+
+        if cur = params[k]
+          if cur.class == Array
+            params[k] << v
+          else
+            params[k] = [cur, v]
+          end
+        else
+          params[k] = v
+        end
+      end
+
+      return params.to_h
+    end
+
+    def self.parse_nested_query(qs, d = nil)
+      params = {}
+
+      unless qs.nil? || qs.empty?
+        (qs || '').split(d ? (COMMON_SEP[d] || /[#{d}] */n) : DEFAULT_SEP).each do |p|
+          k, v = p.split('=', 2).map! { |s| unescape(s) }
+
+          normalize_params(params, k, v)
+        end
+      end
+
+      return params.to_h
+    end
+
+    def self.normalize_params(params, name, v)
+      name =~ %r(\A[\[\]]*([^\[\]]+)\]*)
+      k = $1 || ''
+      after = $' || ''
+
+      if k.empty?
+        if !v.nil? && name == "[]"
+          return Array(v)
+        else
+          return
+        end
+      end
+
+      if after == ''
+        params[k] = v
+      elsif after == "["
+        params[name] = v
+      elsif after == "[]"
+        params[k] ||= []
+        raise ParameterTypeError, "expected Array (got #{params[k].class.name}) for param `#{k}'" unless params[k].is_a?(Array)
+        params[k] << v
+      elsif after =~ %r(^\[\]\[([^\[\]]+)\]$) || after =~ %r(^\[\](.+)$)
+        child_key = $1
+        params[k] ||= []
+        raise ParameterTypeError, "expected Array (got #{params[k].class.name}) for param `#{k}'" unless params[k].is_a?(Array)
+        if params_hash_type?(params[k].last) && !params_hash_has_key?(params[k].last, child_key)
+          normalize_params(params[k].last, child_key, v)
+        else
+          params[k] << normalize_params({}, child_key, v)
+        end
+      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)
+      end
+
+      params
+    end
+
+    def self.unescape(s, encoding = Encoding::UTF_8)
+      URI.decode_www_form_component(s, encoding)
+    end
   end
 end

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/support/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 1.15.1
+  version: 1.16.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -29,47 +29,67 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.7
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: term-ansicolor
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        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