pact-support 1.14.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 92d18ca8bd1b86d4ae9c662ec2a44542527ea210
-  data.tar.gz: 8c7fe0d434067f498247604d32e60d0fc464d59e
+SHA256:
+  metadata.gz: 7ccc117840bc0955cb8ffa7568bab96b94ec5d7d51b6bd5233a05b251373e221
+  data.tar.gz: 66218c13f81e23f76facec82ef95f64038376f3368ae02aa3ce16008288f35fe
 SHA512:
-  metadata.gz: 641f9838234b355e6e0fa3303a12cdad51479ad5ecffe2d5452a9e4e573929063bb2a6fffe4451a7e804a15e4b6613a82bd9c6a08225196cfe15732e07afddb1
-  data.tar.gz: 90c860b8487295c6315b7d070b2df265d94da815eddbae30aab5c91f57a29396e4a0371d542815db00993437bde08ca95ee550e0836649a378e5a9764d05285b
+  metadata.gz: 4e16a0adf65d235937a123a5a1ee0043ded52ba0e4a2541f6b3a7a0e5e208a681cb405baee555b23c66d46a75dcb388999d1f424b0c7bb9c8055839cbf72f9ac
+  data.tar.gz: 0dc8fef0d02eaeb5976395c4a0eb33bdc01ac0ba954dad0eab3a7bc8b24d31625224e28c048d31b551ff1bc15a39ba41bd0f275a80f8d578f9077f0193fdfcb0

data/CHANGELOG.md

@@ -1,3 +1,39 @@
+<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)
+
+
+#### Bug Fixes
+
+* correctly parse matching rules for request paths	 ([cc15a72](/../../commit/cc15a72))
+
+
 <a name="v1.14.0"></a>
 ### v1.14.0 (2020-02-13)
 

data/lib/pact/consumer_contract/interaction_v3_parser.rb

@@ -20,9 +20,9 @@ module Pact
         Pact.configuration.error_stream.puts("WARN: Currently only 1 provider state is supported. Ignoring ")
       end
       metadata = parse_metadata(hash['metadata'])
-      Interaction.new(symbolize_keys(hash).merge(request: request, 
-                                                 response: response, 
-                                                 provider_states: provider_states, 
+      Interaction.new(symbolize_keys(hash).merge(request: request,
+                                                 response: response,
+                                                 provider_states: provider_states,
                                                  provider_state: provider_state,
                                                  metadata: metadata))
     end
@@ -47,14 +47,14 @@ module Pact
 
     def self.parse_request_with_non_string_body request_hash, request_matching_rules, options
       request_hash = request_hash.keys.each_with_object({}) do | key, new_hash |
-        new_hash[key] = Pact::MatchingRules.merge(request_hash[key], request_matching_rules[key], options)
+        new_hash[key] = Pact::MatchingRules.merge(request_hash[key], look_up_matching_rules(key, request_matching_rules), options)
       end
       Pact::Request::Expected.from_hash(request_hash)
     end
 
     def self.parse_response_with_non_string_body response_hash, response_matching_rules, options
       response_hash = response_hash.keys.each_with_object({}) do | key, new_hash |
-        new_hash[key] = Pact::MatchingRules.merge(response_hash[key], response_matching_rules[key], options)
+        new_hash[key] = Pact::MatchingRules.merge(response_hash[key], look_up_matching_rules(key, response_matching_rules), options)
       end
       Pact::Response.from_hash(response_hash)
     end
@@ -78,5 +78,15 @@ module Pact
     def self.parse_metadata metadata_hash
       symbolize_keys(metadata_hash)
     end
+
+    def self.look_up_matching_rules(key, matching_rules)
+      # The matching rules for the path operate on the object itself and don't have sub paths
+      # Convert it into the format that Merge expects.
+      if key == 'path'
+        matching_rules[key] ? { '$.' => matching_rules[key] } : nil
+      else
+        matching_rules[key]
+      end
+    end
   end
 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/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.0"
+    VERSION = "1.15.1"
   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.0
+  version: 1.15.1
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -298,8 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Shared code for Pact gems