pact 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0938fad8f436d5e1e6f143ec47f38ac8ff9de8891c85f3327c51a512d007409
-  data.tar.gz: 4f550fb8e2b8890e298a17d9b176aedf919baec7c84feaee0049c80ad4789d0d
+  metadata.gz: 8e137113e8536b4b90aa2f7797511680e7ece3b71f8ab5d9b79b55dafc88b326
+  data.tar.gz: e3f74756da104c116691133610e8f8dfcfa0abe5abc1bd26bceaaef3e98f5253
 SHA512:
-  metadata.gz: 5f7fc288b6d58e1fb87e4e9f216d19434c41c94f4ab2e39d8bc9f88fdb332f682bdc0e5c4c505569c058da9b96c8378bd2d60dc63cbe0194276ff93228515a3a
-  data.tar.gz: 4a07df495c3984d5b5344ce7c1b92496f69da4f888f18027184638480df328f71bcc57f8a73b03d696ad3d56ba2ee245119382b9dd16653e8d67a0740ad6b005
+  metadata.gz: 5656437ede72b86ff539d7c767f50ee0a55414df06e4d81c02cb87c24b27aca3e59eafdb4ed97eb76f2acc46aef69102f44a62c2366db5b81c975de32c2c721a
+  data.tar.gz: bf032fb5bfbd5e9a9fadc2fe60658ff4de346b62c5e4e94d8d52a835db9792885fb98258203ba721619c9ffe6839877e4538fd2e9a66df53bafbbb53fed36b1d

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+<a name="v2.1.2"></a>
+### v2.1.2 (2026-10-21)
+
+#### Bug Fixes
+
+* support plugin message contents without a transport	 ([c3e4844](/../../commit/c3e4844))
+* remove pact bin for cli no longer packaged in v2	 ([fc5b182](/../../commit/fc5b182))
+
 <a name="v2.1.1"></a>
 ### v2.1.1 (2026-10-19)
 

data/lib/pact/consumer/message_interaction_builder.rb

@@ -55,6 +55,10 @@ module Pact
         @proto_path = nil
         @proto_message_class = nil
         @proto_include_dirs = []
+        @plugin_name = nil
+        @plugin_version = nil
+        @plugin_content_type = nil
+        @plugin_contents = nil
         @meta = {}
         @headers = {}
         @provider_state_meta = nil
@@ -106,6 +110,25 @@ module Pact
         self
       end
 
+      # Any content plugin that needs no transport (e.g. avro), see #with_plugin_contents
+      def with_plugin(plugin_name, plugin_version)
+        raise InteractionBuilderError.new("plugin_name is required") if plugin_name.blank?
+        raise InteractionBuilderError.new("plugin_version is required") if plugin_version.blank?
+
+        @plugin_name = plugin_name
+        @plugin_version = plugin_version
+        self
+      end
+
+      # contents_hash is passed to the plugin as-is, e.g. {"pact:avro" => path, "pact:record-name" => "Order", ...}
+      def with_plugin_contents(content_type, contents_hash)
+        raise InteractionBuilderError.new("content_type is required") if content_type.blank?
+
+        @plugin_content_type = content_type
+        @plugin_contents = InteractionContents.plugin(contents_hash)
+        self
+      end
+
       def with_metadata(meta_hash)
         @meta = InteractionContents.basic(meta_hash)
         self
@@ -122,7 +145,10 @@ module Pact
       end
 
       def validate!
-        if proto_interaction?
+        if custom_plugin_interaction?
+          raise InteractionBuilderError.new("plugin is not defined, please set one with #with_plugin") if @plugin_name.blank? || @plugin_version.blank?
+          raise InteractionBuilderError.new("invalid request format, should be a hash") unless @plugin_contents.is_a?(Hash)
+        elsif proto_interaction?
           raise InteractionBuilderError.new("proto_path / proto_message are not defined, please set ones with #with_proto_message") if @proto_contents.blank? || @proto_message_class.blank?
           raise InteractionBuilderError.new("invalid request format, should be a hash") unless @proto_contents.is_a?(Hash)
         else
@@ -136,7 +162,7 @@ module Pact
 
         validate!
         pact_handle = init_pact
-        init_plugin!(pact_handle) if proto_interaction?
+        init_plugin!(pact_handle) if plugin_interaction?
 
         message_pact = PactFfi::MessageConsumer.new_message_interaction(pact_handle, @description)
 
@@ -163,6 +189,7 @@ module Pact
       end
 
       def build_interaction_json
+        return JSON.dump({"pact:content-type" => @plugin_content_type}.merge(@plugin_contents.transform_keys(&:to_s))) if custom_plugin_interaction?
         return JSON.dump(@json_contents) unless proto_interaction?
 
         contents = {
@@ -240,7 +267,7 @@ module Pact
       end
 
       def fetch_reified_message_body(message_handle)
-        if proto_interaction?
+        if plugin_interaction?
           len = PactFfi::MessageConsumer.get_contents_length(message_handle)
           ptr = PactFfi::MessageConsumer.get_contents_bin(message_handle)
           return nil if ptr.blank? || len == 0
@@ -257,8 +284,8 @@ module Pact
       def configure_interaction!(message_pact)
         interaction_json = build_interaction_json
 
-        if proto_interaction?
-          result = PactFfi::PluginConsumer.interaction_contents(message_pact, 0, PROTO_CONTENT_TYPE, interaction_json)
+        if plugin_interaction?
+          result = PactFfi::PluginConsumer.interaction_contents(message_pact, 0, plugin_content_type, interaction_json)
           if CREATE_INTERACTION_ERRORS[result].present?
             error = CREATE_INTERACTION_ERRORS[result]
             raise CreateInteractionError.new("There was an error while trying to add interaction \"#{@description}\"", error[:reason], error[:status])
@@ -277,11 +304,12 @@ module Pact
       end
 
       def init_plugin!(pact_handle)
-        result = PactFfi::PluginConsumer.using_plugin(pact_handle, PROTOBUF_PLUGIN_NAME, @proto_plugin_version || PROTOBUF_PLUGIN_VERSION)
+        name, version = custom_plugin_interaction? ? [@plugin_name, @plugin_version] : [PROTOBUF_PLUGIN_NAME, @proto_plugin_version || PROTOBUF_PLUGIN_VERSION]
+        result = PactFfi::PluginConsumer.using_plugin(pact_handle, name, version)
         return result if INIT_PLUGIN_ERRORS[result].blank?
 
         error = INIT_PLUGIN_ERRORS[result]
-        raise PluginInitError.new("There was an error while trying to initialize plugin #{PROTOBUF_PLUGIN_NAME}/#{@proto_plugin_version || PROTOBUF_PLUGIN_VERSION}", error[:reason], error[:status])
+        raise PluginInitError.new("There was an error while trying to initialize plugin #{name}/#{version}", error[:reason], error[:status])
       end
 
       def serialize_metadata(metadata_hash)
@@ -294,6 +322,18 @@ module Pact
       def proto_interaction?
         @proto_contents.present?
       end
+
+      def custom_plugin_interaction?
+        @plugin_contents.present?
+      end
+
+      def plugin_interaction?
+        proto_interaction? || custom_plugin_interaction?
+      end
+
+      def plugin_content_type
+        custom_plugin_interaction? ? @plugin_content_type : PROTO_CONTENT_TYPE
+      end
     end
   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.1.1"
+  VERSION = "2.1.2"
 end

data/pact.gemspec

@@ -14,8 +14,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.0'
 
-  gem.files         = `git ls-files bin lib pact.gemspec CHANGELOG.md LICENSE.txt`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
+  gem.files         = `git ls-files lib pact.gemspec CHANGELOG.md LICENSE.txt`.split($/)
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
   gem.license       = 'MIT'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - James Fraser
@@ -406,14 +406,12 @@ email:
 - brent@fuglylogic.com
 - uglyog@gmail.com
 - bskurrie@dius.com.au
-executables:
-- pact
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - LICENSE.txt
-- bin/pact
 - lib/pact.rb
 - lib/pact/configuration.rb
 - lib/pact/consumer.rb

data/bin/pact

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'pact/cli'
-Pact::CLI.start