pact 1.65.2 → 1.66.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57a260592020f08f9b82face34aaa4c8144998f6961a875bb35f47af45d20712
-  data.tar.gz: '03583661eab424c19a9bf429d53ae58cee5d325014f66ca54cbdc087d8e5d74d'
+  metadata.gz: d5f4cb5a83116a65cd755ec7d8e8ab48a07bbd9084854eafe8479ce619258d87
+  data.tar.gz: 453b876959da6e040739f461d53d342c5c76650720480f484694f4f40a67b3f5
 SHA512:
-  metadata.gz: 35e9d39793ff8c09933c659a7361727afd4255d143501d981909f10461bbf9042635ba9ca307e148949aee77bf8b92e09456eb1b094646fda309842cf3bf8c5b
-  data.tar.gz: '03952e5c2c95ec5e1958914b6c9f8c723257ff3f0a083d44270ef2ccc1b1248b0a24599ccbf4927cc16eb176241cd8f3597863ac46d9fc4d20e1e34c6c9134ee'
+  metadata.gz: d4de1c45268fdd6c77c7dddb4ea15235a8cc12604670acb8f64b95569dcbb64de4f1a81e8333e5ec640dcf0da6f90ed8463d34c9203f5c1260d689d16cf1ff81
+  data.tar.gz: 7d5c9e3124136d5604b821566a22f7967f1b2e3fb160ab6a15547462c25a28562b467ee029d6740f42047933d1d55c20c53b4b880f8ea0a86af46e3af1cfbe16

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+<a name="v1.66.0"></a>
+### v1.66.0 (2024-11-29)
+
+#### Features
+
+* **generators**
+  * Add more generators as per spec	 ([f55adf1](/../../commit/f55adf1))
+  * Pass context and add ProviderState generator	 ([7a1cf3b](/../../commit/7a1cf3b))
+
+#### Bug Fixes
+
+* add HTTPS_HOST header if invoking a Sinatra app	 ([ed44189](/../../commit/ed44189))
+* example/animal-service/Gemfile to reduce vulnerabilities	 ([981ebee](/../../commit/981ebee))
+
+<a name="v1.65.3"></a>
+### v1.65.3 (2024-10-23)
+
+#### Bug Fixes
+
+* **test**
+  * explicitly require ostruct as non stdlib in ruby 3.5.x	 ([c9a8525](/../../commit/c9a8525))
+
 <a name="v1.65.2"></a>
 ### v1.65.2 (2024-09-26)
 

data/lib/pact/provider/request.rb

@@ -1,6 +1,7 @@
 require 'json'
 require 'pact/reification'
 require 'pact/shared/null_expectation'
+require 'pact/generators'
 
 module Pact
   module Provider
@@ -10,8 +11,9 @@ module Pact
         # See https://github.com/rack/rack/blob/e7d741c6282ca4cf4e01506f5681e6e6b14c0b32/SPEC#L87-89
         NO_HTTP_PREFIX = ["CONTENT-TYPE", "CONTENT-LENGTH"]
 
-        def initialize expected_request
+        def initialize expected_request, state_params = nil
           @expected_request = expected_request
+          @state_params = state_params
         end
 
         def method
@@ -19,7 +21,7 @@ module Pact
         end
 
         def path
-          expected_request.full_path
+          Pact::Generators.apply_generators(expected_request, "path", expected_request.full_path, @state_params)
         end
 
         def body
@@ -27,17 +29,21 @@ module Pact
           when String then expected_request.body
           when NullExpectation then ''
           else
-            reified_body
+            Pact::Generators.apply_generators(expected_request, "body", reified_body, @state_params)
           end
         end
 
         def headers
           request_headers = {}
+          request_headers.merge!('HTTP_HOST' => 'localhost') if defined?(Sinatra)
           return request_headers if expected_request.headers.is_a?(Pact::NullExpectation)
+
           expected_request.headers.each do |key, value|
-            request_headers[rack_request_header_for(key)] = Pact::Reification.from_term(value)
+            request_headers[key] = Pact::Reification.from_term(value)
           end
-          request_headers
+
+          request_headers = Pact::Generators.apply_generators(expected_request, "header", request_headers, @state_params)
+          request_headers.map{ |key,value| [rack_request_header_for(key), value]}.to_h
         end
 
         private

data/lib/pact/provider/rspec.rb

@@ -25,6 +25,7 @@ module Pact
           pact_uri = pact_source.uri
           Pact.configuration.output_stream.puts "INFO: Reading pact at #{pact_uri}"
           consumer_contract = Pact::ConsumerContract.from_json(pact_json)
+
           suffix = pact_uri.metadata[:pending] ? " [PENDING]": ""
           example_group_description = "Verifying a pact between #{consumer_contract.consumer.name} and #{consumer_contract.provider.name}#{suffix}"
           example_group_metadata = { pactfile_uri: pact_uri, pact_criteria: options[:criteria] }
@@ -77,7 +78,6 @@ module Pact
         end
 
         def describe_interaction interaction, options
-
           # pact_uri and pact_interaction are used by
           # Pact::Provider::RSpec::PactBrokerFormatter
 
@@ -103,8 +103,9 @@ module Pact
             before do | example |
               interaction_context.run_once :before do
                 Pact.configuration.logger.info "Running example '#{Pact::RSpec.full_description(example)}'"
-                set_up_provider_states interaction.provider_states, options[:consumer]
-                replay_interaction interaction, options[:request_customizer]
+                provider_states_result = set_up_provider_states interaction.provider_states, options[:consumer]
+                state_params = provider_states_result[interaction.provider_state];
+                replay_interaction interaction, options[:request_customizer], state_params
                 interaction_context.last_response = last_response
               end
             end
@@ -129,6 +130,7 @@ module Pact
           include Pact::RSpec::Matchers
           extend Pact::Matchers::Messages
 
+
           let(:expected_contents) { expected_response.body[:contents].as_json }
           let(:response) { interaction_context.last_response }
           let(:differ) { Pact.configuration.body_differ_for_content_type diff_content_type }

data/lib/pact/provider/test_methods.rb

@@ -14,8 +14,8 @@ module Pact
       include Pact::Logging
       include Rack::Test::Methods
 
-      def replay_interaction interaction, request_customizer = nil
-        request = Request::Replayable.new(interaction.request)
+      def replay_interaction interaction, request_customizer = nil, state_params = nil
+        request = Request::Replayable.new(interaction.request, state_params)
         request = request_customizer.call(request, interaction) if request_customizer
         args = [request.path, request.body, request.headers]
 
@@ -42,11 +42,17 @@ module Pact
       end
 
       def set_up_provider_states provider_states, consumer, options = {}
+        provider_states_result = {};
         # If there are no provider state, execute with an nil state to ensure global and base states are executed
         Pact.configuration.provider_state_set_up.call(nil, consumer, options) if provider_states.nil? || provider_states.empty?
         provider_states.each do | provider_state |
-          Pact.configuration.provider_state_set_up.call(provider_state.name, consumer, options.merge(params: provider_state.params))
+          result = Pact.configuration.provider_state_set_up.call(provider_state.name, consumer, options.merge(params: provider_state.params))
+          if result.is_a?(Hash)
+            provider_states_result[provider_state.name] = result
+          end
         end
+
+        provider_states_result
       end
 
       def tear_down_provider_states provider_states, consumer, options = {}

data/lib/pact/version.rb

@@ -1,4 +1,4 @@
 # Remember to bump pact-provider-proxy when this changes major version
 module Pact
-  VERSION = "1.65.2"
+  VERSION = "1.66.0"
 end

data/pact.gemspec

@@ -30,8 +30,10 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'rack-test', '>= 0.6.3', '< 3.0.0'
   gem.add_runtime_dependency 'thor', '>= 0.20', '< 2.0'
   gem.add_runtime_dependency "rainbow", '~> 3.1'
+  gem.add_runtime_dependency 'string_pattern', '~> 2.0'
+  gem.add_runtime_dependency 'jsonpath', '~> 1.0'
 
-  gem.add_runtime_dependency 'pact-support', '~> 1.16', '>= 1.16.9'
+  gem.add_runtime_dependency 'pact-support', '~> 1.19', '>= 1.19.0'
   gem.add_runtime_dependency 'pact-mock_service', '~> 3.0', '>= 3.3.1'
 
   gem.add_development_dependency 'rake', '~> 13.0'
@@ -45,4 +47,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'pact-message', '~> 0.8'
   gem.add_development_dependency 'rspec-its', '~> 1.3'
   gem.add_development_dependency 'webrick', '~> 1.8'
+  gem.add_development_dependency 'ostruct'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.65.2
+  version: 1.66.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-26 00:00:00.000000000 Z
+date: 2024-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -82,26 +82,54 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: string_pattern
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: jsonpath
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: pact-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.16.9
+        version: 1.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.16.9
+        version: 1.19.0
 - !ruby/object:Gem::Dependency
   name: pact-mock_service
   requirement: !ruby/object:Gem::Requirement
@@ -282,6 +310,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Enables consumer driven contract testing, providing a mock service and
   DSL for the consumer project, and interaction playback and verification for the
   service provider project.
@@ -419,7 +461,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.20
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Enables consumer driven contract testing, providing a mock service and DSL