pact-support 1.14.1 → 1.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b677a19e1ff31dc6603b612bb0e43df4f5a3f6d7922c8ea1fe6515898915f6c
-  data.tar.gz: f81ebbdc2ec57af625f095492ae60b1bf471cce4e0543d48349e0f031e6a5282
+  metadata.gz: 013c48242b5599c0523e3a0628008cad711662fc96cf40271d5a1f28ae27fe33
+  data.tar.gz: 734a79394ff2baef976fcc0f3ad21907f994892c6dbba7a888d26f37332fdcb2
 SHA512:
-  metadata.gz: 2911a8d750ee6aa10285a7350dea230de47071f497c581aa4eb10302affcc8ab4e8b5771d7896d083ed46b8010737b39ecdbbfdaf0a408fef21f3fb6f4c03c92
-  data.tar.gz: 2d6c453ee8b51686b669e39e1fb138655a99ec6020313b72cd03e35eebbcbbcf80deabb1046808804db52c03ae565e9e6250adadb069b9e656d2fba1dd2dc3aa
+  metadata.gz: e065e5f99495d3e5acd90fa10807b3ed33138669ea120e0709b2fce1169b53085fa81ad2751120f21befaad1a89bb1295d3a1837465ac1eebf5c2dc6f8a9bad1
+  data.tar.gz: 36054ddc380804d4b94b18829ec6859a595b82f14ccae0de78e5d5f842aa266af04c78782677b1d8a9a52f37a72e1168e203bfaac28d53e2ad8acaa79c90cadd

data/CHANGELOG.md

@@ -1,3 +1,39 @@
+<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)
+
+
+#### Bug Fixes
+
+* follow first redirect when fetching remote pact artifacts. (#80)	 ([c1df6dd](/../../commit/c1df6dd))
+
+
+<a name="v1.14.3"></a>
+### v1.14.3 (2020-04-06)
+
+
+#### Bug Fixes
+
+* do not blow up when there are no matchers	 ([ac70846](/../../commit/ac70846))
+
+
+<a name="v1.14.2"></a>
+### v1.14.2 (2020-03-25)
+
+
+#### Bug Fixes
+
+* don't blow up when there is a term inside an each like	 ([a565a56](/../../commit/a565a56))
+
+
 <a name="v1.14.1"></a>
 ### v1.14.1 (2020-02-27)
 

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/pact_file.rb

@@ -79,12 +79,37 @@ module Pact
 
     def get_remote(uri, options)
       request = Net::HTTP::Get.new(uri)
+      request = prepare_auth(request, options) if options[:username] || options[:token]
+
+      http = prepare_request(uri)
+      response = perform_http_request(http, request, options)
+
+      if response.is_a?(Net::HTTPRedirection)
+        uri = URI(response.header['location'])
+        req = Net::HTTP::Get.new(uri)
+        req = prepare_auth(req, options) if options[:username] || options[:token]
+
+        http = prepare_request(uri)
+        response = perform_http_request(http, req, options)
+      end
+      response
+    end
+
+    def prepare_auth(request, options)
       request.basic_auth(options[:username], options[:password]) if options[:username]
       request['Authorization'] = "Bearer #{options[:token]}" if options[:token]
+      request
+    end
+
+    def prepare_request(uri)
       http = Net::HTTP.new(uri.host, uri.port, :ENV)
       http.use_ssl = (uri.scheme == 'https')
       http.ca_file = ENV['SSL_CERT_FILE'] if ENV['SSL_CERT_FILE'] && ENV['SSL_CERT_FILE'] != ''
       http.ca_path = ENV['SSL_CERT_DIR'] if ENV['SSL_CERT_DIR'] && ENV['SSL_CERT_DIR'] != ''
+      http
+    end
+
+    def perform_http_request(http, request, options)
       http.start do |http|
         http.open_timeout = options[:open_timeout] || OPEN_TIMEOUT
         http.read_timeout = options[:read_timeout] || READ_TIMEOUT

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/matchers/matchers.rb

@@ -120,7 +120,11 @@ module Pact
     def array_like_diff array_like, actual, options
       if actual.is_a? Array
         expected_size = [array_like.min, actual.size].max
-        expected_array = expected_size.times.collect{ Pact::Term.unpack_regexps(array_like.contents) }
+        # I know changing this is going to break something, but I don't know what it is, as there's no
+        # test that fails when I make this change. I know the unpack regexps was there for a reason however.
+        # Guess we'll have to change it and see!
+        # expected_array = expected_size.times.collect{ Pact::Term.unpack_regexps(array_like.contents) }
+        expected_array = expected_size.times.collect{ array_like.contents }
         actual_array_diff expected_array, actual, options.merge(:type => true)
       else
         Difference.new array_like.generate, actual, type_difference_message(array_like.generate, actual)

data/lib/pact/matching_rules/v3/merge.rb

@@ -108,8 +108,10 @@ module Pact
         def log_ignored_rules
           @matching_rules.each do | jsonpath, rules_hash |
             rules_array = rules_hash["matchers"]
-            ((rules_array.length - 1)..0).each do | index |
-              rules_array.delete_at(index) if rules_array[index].empty?
+            if rules_array
+              ((rules_array.length - 1)..0).each do | index |
+                rules_array.delete_at(index) if rules_array[index].empty?
+              end
             end
           end
 

data/lib/pact/support/version.rb

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

data/lib/pact/term.rb

@@ -80,6 +80,5 @@ module Pact
         destination[key] = unpack_regexps source[key]
       end
     end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.15.2
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2020-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -70,6 +70,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -298,8 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Shared code for Pact gems