pact-support 1.16.6 → 1.16.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87344137693fa6e4f3a31d9794ab10a09680cebc96d5caaa62b9191b54643347
-  data.tar.gz: 4ee4e677c7d144e5fef6bf93ee568ee9a8f588bd04ba6b13b0c45bc7ddb044b8
+  metadata.gz: c09158af5f53a850b84bb939265b42de8dd5cb9d09f662004443a9d752268968
+  data.tar.gz: db8cc140cff9641ed1bb9540959b58beb1258d55112f8377a9751e0d4435e28b
 SHA512:
-  metadata.gz: a7d9067f4a4582fc58ed8e74abc6201ec21060701f9baf7e40fcbc4887982aafef05afa1a11534bca492e57253ee37f91a764dd03c81abaa4d62cb90976f178a
-  data.tar.gz: 607223093f8ec2b7adb4415d229cfa2a0ed2fa2a74e633ed444d61ac2b9775b7097ea11d8b1dc70873b33249cb44c8f7f86ab42c9bbe1369367b99da7cddc77f
+  metadata.gz: 9a2fd0c40074e31a07968fc4546868ef358c2179ed31adc3bba8dd6d438dd3a1b419f5a473af6c383b39a7ab81d40c8587ba2f1eba8ffae4df26d0db6581acaf
+  data.tar.gz: ef379ad7d79957f40bf6aa6c6acf7879d89a39bf722757faba5b64e323e94c821401baf9ee761da3c3b213ba40f58e64a3d1c98d17427ff985febfb59648ddaf

data/CHANGELOG.md

@@ -1,3 +1,31 @@
+<a name="v1.16.10"></a>
+### v1.16.10 (2021-10-01)
+
+#### Bug Fixes
+
+* change expgen to a runtime dependency	 ([da81634](/../../commit/da81634))
+
+<a name="v1.16.9"></a>
+### v1.16.9 (2021-09-30)
+
+#### Bug Fixes
+
+* remove randexp dependency (#91)	 ([794fd4e](/../../commit/794fd4e))
+
+<a name="v1.16.8"></a>
+### v1.16.8 (2021-07-27)
+
+#### Bug Fixes
+
+* log HTTP request for pacts retrieved by URL when requested with verbose=true	 ([3288b81](/../../commit/3288b81))
+
+<a name="v1.16.7"></a>
+### v1.16.7 (2021-01-28)
+
+#### Bug Fixes
+
+* dynamically parse actual query to match expected format	 ([a86a3e3](/../../commit/a86a3e3))
+
 <a name="v1.16.6"></a>
 ### v1.16.6 (2021-01-28)
 

data/lib/pact/consumer_contract/interaction_v2_parser.rb

@@ -36,7 +36,7 @@ module Pact
       # in the translation between string => structured object, as we don't know/store which
       # query string convention was used.
       if query_is_string
-        request_hash['query'] = Pact::QueryHash.new(request_hash['query'], original_query_string)
+        request_hash['query'] = Pact::QueryHash.new(request_hash['query'], original_query_string, Pact::Query.parsed_as_nested?(request_hash['query']))
       end
       request = Pact::Request::Expected.from_hash(request_hash)
     end

data/lib/pact/consumer_contract/pact_file.rb

@@ -1,4 +1,6 @@
-require 'net/http'
+require "net/http"
+require "pact/configuration"
+require "pact/http/authorization_header_redactor"
 
 module Pact
   module PactFile
@@ -81,7 +83,7 @@ module Pact
       request = Net::HTTP::Get.new(uri)
       request = prepare_auth(request, options) if options[:username] || options[:token]
 
-      http = prepare_request(uri)
+      http = prepare_request(uri, options)
       response = perform_http_request(http, request, options)
 
       if response.is_a?(Net::HTTPRedirection)
@@ -89,7 +91,7 @@ module Pact
         req = Net::HTTP::Get.new(uri)
         req = prepare_auth(req, options) if options[:username] || options[:token]
 
-        http = prepare_request(uri)
+        http = prepare_request(uri, options)
         response = perform_http_request(http, req, options)
       end
       response
@@ -101,11 +103,12 @@ module Pact
       request
     end
 
-    def prepare_request(uri)
+    def prepare_request(uri, options)
       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.set_debug_output(Pact::Http::AuthorizationHeaderRedactor.new(Pact.configuration.output_stream)) if options[:verbose]
       http
     end
 

data/lib/pact/consumer_contract/query.rb

@@ -6,6 +6,8 @@ module Pact
     DEFAULT_SEP = /[&;] */n
     COMMON_SEP = { ";" => /[;] */n, ";," => /[;,] */n, "&" => /[&] */n }
 
+    class NestedQuery < Hash; end
+
     def self.create query
       if query.is_a? Hash
         Pact::QueryHash.new(query)
@@ -18,12 +20,16 @@ module Pact
       object.is_a?(Pact::QueryHash) || object.is_a?(Pact::QueryString)
     end
 
+    def self.parsed_as_nested?(object)
+      object.is_a?(NestedQuery)
+    end
+
     def self.parse_string query_string
-      parsed_query = parse_query(query_string)
+      parsed_query = parse_string_as_non_nested_query(query_string)
 
       # If Rails nested params...
       if parsed_query.keys.any?{ | key| key =~ /\[.*\]/ }
-        parse_nested_query(query_string)
+        parse_string_as_nested_query(query_string)
       else
         parsed_query.each_with_object({}) do | (key, value), new_hash |
           new_hash[key] = [*value]
@@ -33,7 +39,7 @@ module Pact
 
     # 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)
+    def self.parse_string_as_non_nested_query(qs, d = nil, &unescaper)
       unescaper ||= method(:unescape)
 
       params = {}
@@ -56,7 +62,7 @@ module Pact
       return params.to_h
     end
 
-    def self.parse_nested_query(qs, d = nil)
+    def self.parse_string_as_nested_query(qs, d = nil)
       params = {}
 
       unless qs.nil? || qs.empty?
@@ -67,7 +73,7 @@ module Pact
         end
       end
 
-      return params.to_h
+      return NestedQuery[params.to_h]
     end
 
     def self.normalize_params(params, name, v)

data/lib/pact/consumer_contract/query_hash.rb

@@ -10,9 +10,18 @@ module Pact
 
     attr_reader :original_string
 
-    def initialize(query, original_string = nil)
+    def initialize(query, original_string = nil, nested = false)
       @hash = query.nil? ? query : convert_to_hash_of_arrays(query)
       @original_string = original_string
+      @nested = nested
+    end
+
+    def nested?
+      @nested
+    end
+
+    def any_key_contains_square_brackets?
+      query.keys.any?{ |key| key =~ /\[.*\]/ }
     end
 
     def as_json(opts = {})
@@ -35,7 +44,14 @@ 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(convert_to_hash_of_arrays(Query.parse_string(other.query))), allow_unexpected_keys: false)
+
+      if any_key_contains_square_brackets?
+        other_query_hash_non_nested = Query.parse_string_as_non_nested_query(other.query)
+        Pact::Matchers.diff(query, convert_to_hash_of_arrays(other_query_hash_non_nested), allow_unexpected_keys: false)
+      else
+        other_query_hash = Query.parse_string(other.query)
+        Pact::Matchers.diff(query, symbolize_keys(convert_to_hash_of_arrays(other_query_hash)), allow_unexpected_keys: false)
+      end
     end
 
     def query

data/lib/pact/http/authorization_header_redactor.rb

@@ -0,0 +1,32 @@
+require "delegate"
+
+module Pact
+  module Http
+    class AuthorizationHeaderRedactor < SimpleDelegator
+      def puts(*args)
+        __getobj__().puts(*redact_args(args))
+      end
+
+      def print(*args)
+        __getobj__().puts(*redact_args(args))
+      end
+
+      def <<(*args)
+        __getobj__().send(:<<, *redact_args(args))
+      end
+
+      private
+
+      attr_reader :redactions
+
+      def redact_args(args)
+        args.collect{ | s| redact(s) }
+      end
+
+      def redact(string)
+        return string unless string.is_a?(String)
+        string.gsub(/Authorization: .*\\r\\n/, "Authorization: [redacted]\\r\\n")
+      end
+    end
+  end
+end

data/lib/pact/reification.rb

@@ -1,4 +1,4 @@
-require 'randexp'
+require 'expgen'
 require 'pact/term'
 require 'pact/something_like'
 require 'pact/array_like'
@@ -13,8 +13,10 @@ module Pact
 
     def self.from_term(term)
       case term
-      when Pact::Term, Regexp, Pact::SomethingLike, Pact::ArrayLike
+      when Pact::Term, Pact::SomethingLike, Pact::ArrayLike
         from_term(term.generate)
+      when Regexp
+        from_term(Expgen.gen(term))
       when Hash
         term.inject({}) do |mem, (key,t)|
           mem[key] = from_term(t)

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "1.16.6"
+    VERSION = "1.16.10"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 1.16.6
+  version: 1.16.10
 platform: ruby
 authors:
 - James Fraser
@@ -12,64 +12,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: randexp
+  name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        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.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.9'
 - !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: diff-lcs
+  name: expgen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -254,6 +254,7 @@ files:
 - lib/pact/consumer_contract/string_with_matching_rules.rb
 - lib/pact/errors.rb
 - lib/pact/helpers.rb
+- lib/pact/http/authorization_header_redactor.rb
 - lib/pact/logging.rb
 - lib/pact/matchers.rb
 - lib/pact/matchers/actual_type.rb
@@ -318,7 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.7
+rubygems_version: 3.2.28
 signing_key: 
 specification_version: 4
 summary: Shared code for Pact gems