feat: allow different consumer contract parsers to be registered

Author: bethesque

lib/pact/consumer_contract/consumer_contract.rb

@@ -9,11 +9,10 @@
 require 'pact/consumer_contract/service_consumer'
 require 'pact/consumer_contract/service_provider'
 require 'pact/consumer_contract/interaction'
-require 'pact/consumer_contract/message'
 require 'pact/consumer_contract/pact_file'
+require 'pact/consumer_contract/http_consumer_contract_parser'
 
 module Pact
-
   class ConsumerContract
 
     include SymbolizeKeys
@@ -30,21 +29,19 @@ def initialize(attributes = {})
       @provider = attributes[:provider]
     end
 
+    def self.add_parser consumer_contract_parser
+      parsers << consumer_contract_parser
+    end
+
+    def self.parsers
+      @parsers ||= [Pact::HttpConsumerContractParser.new]
+    end
+
     def self.from_hash(hash)
-      hash = symbolize_keys(hash)
-      interactions = if hash[:interactions]
-        hash[:interactions].collect { |hash| Interaction.from_hash(hash)}
-      elsif hash[:messages]
-        hash[:messages].collect { |hash| Message.from_hash(hash)}
-      else
-        [] # or raise an error?
+      parsers.each do | parser |
+        return parser.call(hash) if parser.can_parse?(hash)
       end
-
-      new(
-        :consumer => ServiceConsumer.from_hash(hash[:consumer]),
-        :provider => ServiceProvider.from_hash(hash[:provider]),
-        :interactions => interactions
-      )
+      raise Pact::Error.new("No consumer contract parser found for hash: #{hash}")
     end
 
     def self.from_json string

lib/pact/consumer_contract/http_consumer_contract_parser.rb

@@ -0,0 +1,26 @@
+module Pact
+  class HttpConsumerContractParser
+    include SymbolizeKeys
+
+    def call(hash)
+      hash = symbolize_keys(hash)
+      interactions = if hash[:interactions]
+        hash[:interactions].collect { |hash| Interaction.from_hash(hash)}
+      elsif hash[:messages]
+        hash[:messages].collect { |hash| Message.from_hash(hash)}
+      else
+        [] # or raise an error?
+      end
+
+      ConsumerContract.new(
+        :consumer => ServiceConsumer.from_hash(hash[:consumer]),
+        :provider => ServiceProvider.from_hash(hash[:provider]),
+        :interactions => interactions
+      )
+    end
+
+    def can_parse?(hash)
+      hash.key?('interactions') || hash.key?(:interactions)
+    end
+  end
+end

lib/pact/consumer_contract/interaction.rb

@@ -40,10 +40,6 @@ def http?
         true
       end
 
-      def message?
-        false
-      end
-
       def validate!
         raise Pact::InvalidInteractionError.new(self) unless description && request && response
       end

lib/pact/consumer_contract/message.rb

@@ -2,9 +2,6 @@ module Pact
   class Error < ::StandardError
   end
 
-  class InvalidMessageError < Error
-  end
-
   # Raised when the interaction is not defined correctly
   class InvalidInteractionError < Error
     def initialize(interaction)

lib/pact/consumer_contract/message/content.rb

@@ -52,28 +52,6 @@ module Pact
           end
         end
       end
-
-      context "with a Message contract" do
-        let(:string) { '{"messages":[{"content": {"foo": "bar"}}],  "consumer": {"name" : "Bob"} , "provider": {"name" : "Mary"}}' }
-
-        it "should create a Pact" do
-          expect(loaded_pact).to be_instance_of ConsumerContract
-        end
-
-        it "should have messages" do
-          expect(loaded_pact.interactions).to be_instance_of Array
-          expect(loaded_pact.interactions.first).to be_instance_of Pact::ConsumerContract::Message
-        end
-
-        it "should have a consumer" do
-          expect(loaded_pact.consumer).to be_instance_of Pact::ServiceConsumer
-        end
-
-        it "should have a provider" do
-          expect(loaded_pact.provider).to be_instance_of Pact::ServiceProvider
-        end
-
-      end
     end
 
     describe "find_interactions" do