pact-v2 2.0.0.pre.preview2 → 2.0.0.pre.preview3

data/lib/pact/v2/matchers.rb

@@ -89,6 +89,22 @@ module Pact
       def match_each_kv(template, key_matchers)
         V4::EachKeyValue.new(key_matchers.is_a?(Array) ? key_matchers : [key_matchers], template)
       end
+
+      def match_semver(template = nil)
+        V3::Semver.new(template)
+      end
+
+      def match_content_type(content_type, template = nil)
+        V3::ContentType.new(content_type, template: template)
+      end
+
+      def match_not_empty(template = nil)
+        V4::NotEmpty.new(template)
+      end
+
+      def match_status_code(template)
+        V4::StatusCode.new(template)
+      end
     end
   end
 end

data/lib/pact/v2/provider/pact_broker_proxy.rb

@@ -60,11 +60,6 @@ module Pact
           logger.error("cannot parse broker response: #{ex.message}")
         end
 
-
-        def set_description_prefix(interaction, prefix)
-          orig_description = interaction["description"]
-          interaction["description"] = "#{prefix} #{orig_description}" unless orig_description.start_with?(prefix)
-        end
       end
     end
   end

data/lib/pact/v2/rspec/support/pact_consumer_helpers.rb

@@ -5,6 +5,7 @@ require "json"
 
 module PactV2ConsumerDsl
   include Pact::V2::Matchers
+  include Pact::V2::Generators
 
   module ClassMethods
     def has_http_pact_between(consumer, provider, opts: {})
@@ -19,6 +20,18 @@ module PactV2ConsumerDsl
       _has_pact_between(:message, consumer, provider, opts: opts)
     end
 
+    def has_plugin_http_pact_between(consumer, provider, opts: {})
+      _has_pact_between(:plugin_http, consumer, provider, opts: opts)
+    end
+
+    def has_plugin_sync_message_pact_between(consumer, provider, opts: {})
+      _has_pact_between(:plugin_sync_message, consumer, provider, opts: opts)
+    end
+
+    def has_plugin_async_message_pact_between(consumer, provider, opts: {})
+      _has_pact_between(:plugin_async_message, consumer, provider, opts: opts)
+    end
+
     def _has_pact_between(transport_type, consumer, provider, opts: {})
       raise "has_#{transport_type}_pact_between is designed to be used with RSpec 3+" unless defined?(::RSpec)
       raise "has_#{transport_type}_pact_between has to be declared at the top level of a suite" unless top_level?
@@ -52,13 +65,13 @@ module PactV2ConsumerDsl
 
     yield(mock_server)
 
+  ensure
     if mock_server.matched?
       mock_server.write_pacts!(pact_config.pact_dir)
     else
       msg = mismatches_error_msg(mock_server)
       raise Pact::V2::Consumer::HttpInteractionBuilder::InteractionMismatchesError.new(msg)
     end
-  ensure
     @used = true
     mock_server&.cleanup
     reset_pact

data/lib/pact/v2/version.rb

@@ -2,7 +2,7 @@
 
 module Pact
   module V2
-    VERSION = '2.0.0-preview2'
-    Version = '2.0.0-preview2'
+    VERSION = '0.12.0'
+    Version = '0.12.0'
   end
 end

data/lib/pact/version.rb

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

data/lib/pact.rb

@@ -1,13 +1,7 @@
-
-# Selective loading of pact v1 and v2 based on environment variables
-if ENV['PACT_RUBY_V1_ENABLE'] != 'false'
-  require 'pact/support'
-  require 'pact/version'
-  require 'pact/configuration'
-  require 'pact/consumer'
-  require 'pact/provider'
-  require 'pact/consumer_contract'
-end
-if ENV['PACT_RUBY_V2_ENABLE'] == 'true'
-  require 'pact/v2'
-end
+require 'pact/support'
+require 'pact/version'
+require 'pact/configuration'
+require 'pact/consumer'
+require 'pact/provider'
+require 'pact/consumer_contract'
+require 'pact/v2'

data/pact.gemspec

@@ -26,81 +26,71 @@ Gem::Specification.new do |gem|
     'documentation_uri' => 'https://github.com/pact-foundation/pact-ruby/blob/master/README.md'
   }
 
-  # Shared dependencies between v1 and v2
+  # Shared dev dependencies between v1 and v2
   gem.add_development_dependency 'rake', '~> 13.0'
   gem.add_development_dependency 'faraday', '~>2.0', '<3.0'
   gem.add_development_dependency 'webmock', '~> 3.0'
 
-  # Control which version of pact to use
-  # PACT_RUBY_V1_ENABLE=true to disable v1 (default is enabled)
-  # PACT_RUBY_V2_ENABLE=true to enable v2 (default is disabled)
-  # Both can be enabled at the same time, to enable transition
-  
-  if ENV['PACT_RUBY_V1_ENABLE'] != 'false'
-    gem.add_runtime_dependency 'rspec', '~> 3.0'
-    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'
+  # Shared runtime dependencies between v1 and v2
+  gem.add_runtime_dependency 'rspec', '~> 3.0'
 
-    gem.add_runtime_dependency "pact-support" , "~> 1.21", ">=1.21.2"
-    gem.add_runtime_dependency 'pact-mock_service', '~> 3.0', '>= 3.3.1'
-    gem.add_development_dependency 'fakefs', '2.4'
-    gem.add_development_dependency 'hashie', '~> 5.0'
-    gem.add_development_dependency 'faraday-multipart', '~> 1.0'
-    gem.add_development_dependency 'conventional-changelog', '~> 1.3'
-    gem.add_development_dependency 'bump', '~> 0.5'
-    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
+  # Pact v2 dependencies
 
-  if ENV['PACT_RUBY_V2_ENABLE'] == 'true'
+  # Core dependencies (code loading)
+  gem.add_dependency "zeitwerk", "~> 2.3"
+  # For Pact support via Pact Rust Core
+  gem.add_dependency "pact-ffi", "~> 0.4.28"
+  # For Provider Side Verification
+  gem.add_dependency "rack"
+  gem.add_dependency "rack-proxy"
+  gem.add_dependency "webrick", '~> 1.8'
+  # For Rails support, including testing non rails apps
+  gem.add_development_dependency "combustion", ">= 1.3"
+  # For Kafka support
+  unless RUBY_PLATFORM =~ /win32|x64-mingw32|x64-mingw-ucrt/
+    # windows does not support librdkafka
+    gem.add_development_dependency "sbmt-kafka_consumer", ">= 2.0.1"
+    gem.add_development_dependency "sbmt-kafka_producer", ">= 1.0"
+  end
+  if ENV['X_PACT_DEVELOPMENT_RDKAFKA'] == 'true'
+    # darwin-arm64 prebuilt gems available from 0.20.0
+    gem.add_development_dependency "karafka-rdkafka", ">= 0.20.0"
+  end 
+  # For gRPC support
+  gem.add_development_dependency "gruf", ">= 2.18"
+  gem.add_development_dependency "gruf-rspec", ">= 0.6.0"
+  # Testing tools
+  gem.add_development_dependency "rspec"
+  gem.add_development_dependency "rspec-rails"
+  gem.add_development_dependency "rspec_junit_formatter"
+  gem.add_development_dependency "vcr", ">= 6.0"
+  # Development and linting tools
+  gem.add_development_dependency "appraisal", ">= 2.4"
+  gem.add_development_dependency "bundler", ">= 2.2"
+  gem.add_development_dependency "rubocop"
+  gem.add_development_dependency "rubocop-rspec"
+  gem.add_development_dependency "rubocop-rails"
+  gem.add_development_dependency "rubocop-performance"
+  gem.add_development_dependency "standard", ">= 1.35.1"
 
-    # Core dependencies (code loading)
-    gem.add_dependency "zeitwerk", "~> 2.3"
-    
-    # For Pact support via Pact Rust Core
-    gem.add_dependency "pact-ffi", "~> 0.4.28"
-   
-    # For Provider Side Verification
-    gem.add_dependency "rack"
-    gem.add_dependency "rack-proxy"
-    gem.add_dependency "webrick", '~> 1.8'
-    
-    # For Rails support, including testing non rails apps
-    gem.add_development_dependency "combustion", ">= 1.3"
 
-    # For Kafka support
-    unless RUBY_PLATFORM =~ /win32|x64-mingw32|x64-mingw-ucrt/
-      # windows does not support librdkafka
-      gem.add_development_dependency "sbmt-kafka_consumer", ">= 2.0.1"
-      gem.add_development_dependency "sbmt-kafka_producer", ">= 1.0"
-    end
-    if ENV['X_PACT_DEVELOPMENT_RDKAFKA'] == 'true'
-      # darwin-arm64 prebuilt gems available from 0.20.0
-      gem.add_development_dependency "karafka-rdkafka", ">= 0.20.0"
-    end
-    
-    # For gRPC support
-    gem.add_development_dependency "gruf", ">= 2.18"
-    gem.add_development_dependency "gruf-rspec", ">= 0.6.0"
+  # Pact v1 dependencies
+  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'
 
-    # Testing tools
-    gem.add_development_dependency "rspec"
-    gem.add_development_dependency "rspec-rails"
-    gem.add_development_dependency "rspec_junit_formatter"
-    gem.add_development_dependency "vcr", ">= 6.0"
+  gem.add_runtime_dependency "pact-support" , "~> 1.21", ">=1.21.2"
+  gem.add_runtime_dependency 'pact-mock_service', '~> 3.0', '>= 3.3.1'
+  gem.add_development_dependency 'fakefs', '2.4'
+  gem.add_development_dependency 'hashie', '~> 5.0'
+  gem.add_development_dependency 'faraday-multipart', '~> 1.0'
+  gem.add_development_dependency 'conventional-changelog', '~> 1.3'
+  gem.add_development_dependency 'bump', '~> 0.5'
+  gem.add_development_dependency 'pact-message', '~> 0.8'
+  gem.add_development_dependency 'rspec-its', '~> 1.3'
+  # gem.add_development_dependency 'webrick', '~> 1.8' # webrick is a runtime dependency of pact v2, so included above
+  gem.add_development_dependency 'ostruct'
 
-    # Development and linting tools
-    gem.add_development_dependency "appraisal", ">= 2.4"
-    gem.add_development_dependency "bundler", ">= 2.2"
-    gem.add_development_dependency "rubocop"
-    gem.add_development_dependency "rubocop-rspec"
-    gem.add_development_dependency "rubocop-rails"
-    gem.add_development_dependency "rubocop-performance"
-    gem.add_development_dependency "standard", ">= 1.35.1"
-  end
 end