pact-support 1.14.3 → 1.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '087dcf6851c39ea4ebd35e99b0ca22187881043cfdfd9066aec43f84e7b0312a'
-  data.tar.gz: 0dbadb7e1f17f75c08380559800293bc1d150c96d86f757d28baf12a0db3151e
+  metadata.gz: bbf781395b4831b71e7c146cd7b4b4147720735a4d215c03809f63f6914355b6
+  data.tar.gz: dc33661cde8c26da60d3377152de106a7eb018c936366cf2eb27cefc8b2ec8e5
 SHA512:
-  metadata.gz: 605bef579256f250e1f460558c1c70f5883ce3112aec69b41aa26128ba76d0f3fbebd7c6ca766c5d2552b22302d60c3c9b34a42d69ae6d642dde2db227b365fc
-  data.tar.gz: 6d3876bbfa8f702790a4131c72fb092952297ee963e2a0e6cdd28d76de69ef6fdd6c11c55d18ef5cfc907fddc9fb972838f01a6f16d0700c93d920a7697e351b
+  metadata.gz: 23424ffbcfc67d2e1a6f71e451f777ea56b1ad4ea1f5bbc017e40ccd236516ed88faa1724f1cfa5867da9f72904e4e0dd42f3e15aec4638441df44f94cfdc095
+  data.tar.gz: 0c844a6243463605b30bbb8f0de186603ff7fe93ba032f5ee702b1496b562d4877daafa155d6680077dc8258235049ecf816b52a6bd496b9531f4886ac6f06bf

data/CHANGELOG.md

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

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

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "1.14.3"
+    VERSION = "1.15.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 1.14.3
+  version: 1.15.4
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2020-11-04 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