pact-support 1.2.99.alpha.1 → 1.3.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb6aa8891e3b73c96d764ca9dd4c43849dc2972b
-  data.tar.gz: 79d896556e2d8eb9679aa41ae84200fe26fec695
+  metadata.gz: e10753ec318df69161ec6f2a534ea7fb131c3d51
+  data.tar.gz: 23b534ba416c93e6288f90e3da177fbc8dad0c66
 SHA512:
-  metadata.gz: 9c3ca1df6aef0c0c5fa2944f9a75980dd5c2970d99c23c3940d8a1812fce409f9ac2f527733a3c9d06505453ae09b7dbddc6383170b62b1191c4036c0ffb6dac
-  data.tar.gz: b16006ef3b27268ecfa08793847709f9aee236c4b7ebf11a8a539bf41ffc4f38e7a1e76d63149e04bf9fc7bc916b05660e799e3bf974f487c35ab52a9e951104
+  metadata.gz: 183ac6a64f3fe3fe5f2e698e33a18ca53f48f73b93fd27a2763555d83aff31004ab2c514178d4ea2c3e5090a7b7eb26dee4ce7d2423ec72d50ee7cfdaafd73b5
+  data.tar.gz: c40e1da71b32c101961908a4caa4bccf11a5918ae5084853588fcb019411d0b62896f673865558c50615cc56dc4a9b32d7f7555b2716300cccef012006dc07ba

data/lib/pact/consumer_contract/consumer_contract.rb

@@ -9,10 +9,11 @@ require 'open-uri'
 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
@@ -29,19 +30,21 @@ module Pact
       @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)
-      parsers.each do | parser |
-        return parser.call(hash) if parser.can_parse?(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
-      raise Pact::Error.new("No consumer contract parser found for hash: #{hash}")
+
+      new(
+        :consumer => ServiceConsumer.from_hash(hash[:consumer]),
+        :provider => ServiceProvider.from_hash(hash[:provider]),
+        :interactions => interactions
+      )
     end
 
     def self.from_json string

data/lib/pact/consumer_contract/interaction.rb

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

data/lib/pact/consumer_contract/message.rb

@@ -0,0 +1,146 @@
+require 'pact/consumer_contract/message/content'
+require 'pact/symbolize_keys'
+require 'pact/shared/active_support_support'
+require 'pact/matching_rules'
+require 'pact/errors'
+require 'pact/consumer/request'
+require 'pact/consumer_contract/response'
+require 'pact/consumer_contract/message/content'
+
+module Pact
+  class ConsumerContract
+    class Message
+      include Pact::ActiveSupportSupport
+      include Pact::SymbolizeKeys
+
+        attr_accessor :description, :content, :provider_state
+
+        def initialize attributes = {}
+          @description = attributes[:description]
+          @provider_state = attributes[:provider_state] || attributes[:providerState]
+          @content = attributes[:content]
+        end
+
+        def self.from_hash hash
+          content_hash = Pact::MatchingRules.merge(hash['content'], hash['content']['matchingRules'])
+          content = Pact::ConsumerContract::Message::Content.new(content_hash)
+          new(symbolize_keys(hash).merge(content: content))
+        end
+
+        def to_hash
+          {
+            description: description,
+            provider_state: provider_state,
+            content: content.to_hash,
+          }
+        end
+
+        # todo move this proper decorator
+        def as_json
+          {
+            description: description,
+            providerState: provider_state,
+            content: content.as_json
+          }
+        end
+
+        def request
+          @request ||= Pact::Consumer::Request::Actual.from_hash(
+            path: '/',
+            method: 'POST',
+            query: nil,
+            headers: {'Content-Type' => 'application/json'},
+            body: {
+              description: description,
+              providerStates: [{
+                name: provider_state
+              }]
+            }
+          )
+        end
+
+        # custom media type?
+        def response
+          @response ||= Pact::Response.new(
+            status: 200,
+            headers: {'Content-Type' => 'application/json'},
+            body: {
+              content: content
+            }
+          )
+        end
+
+        def http?
+          false
+        end
+
+        def message?
+          true
+        end
+
+        def validate!
+          raise Pact::InvalidMessageError.new(self) unless description && content
+        end
+
+        def == other
+          other.is_a?(Message) && to_hash == other.to_hash
+        end
+
+        def matches_criteria? criteria
+          criteria.each do | key, value |
+            unless match_criterion self.send(key.to_s), value
+              return false
+            end
+          end
+          true
+        end
+
+        def match_criterion target, criterion
+          target == criterion || (criterion.is_a?(Regexp) && criterion.match(target))
+        end
+
+        def eq? other
+          self == other
+        end
+
+        def description_with_provider_state_quoted
+          provider_state ? "\"#{description}\" given \"#{provider_state}\"" : "\"#{description}\""
+        end
+
+        def to_s
+          to_hash.to_s
+        end
+    end
+  end
+end
+
+# I'm not sure whether to make Pact::Message a module or a class at this stage, so making
+# the "public interface" to the pact-support library support Pact::Message.new either way
+
+if Pact.const_defined?('Message') && Pact::Message.class == Module
+  module Pact
+    module Message
+      def self.new *args
+        Pact::ConsumerContract::Message.new(*args)
+      end
+
+      def self.from_hash *args
+        Pact::ConsumerContract::Message.from_hash(*args)
+      end
+    end
+  end
+end
+
+if Pact.const_defined?('Message') && Pact::Message.class == Class
+  module Pact
+    class Message
+      def self.new *args
+        Pact::ConsumerContract::Message.new(*args)
+      end
+
+      def self.from_hash *args
+        Pact::ConsumerContract::Message.from_hash(*args)
+      end
+    end
+  end
+end

data/lib/pact/consumer_contract/message/content.rb

@@ -0,0 +1,61 @@
+module Pact
+  class ConsumerContract
+    class Message
+      class Content
+        include ActiveSupportSupport
+        include SymbolizeKeys
+
+        def initialize content
+          @content = content
+        end
+
+        def to_s
+          if @content.is_a?(Hash) || @content.is_a?(Array)
+            @content.to_json
+          else
+            @content.to_s
+          end
+        end
+
+        def as_json
+          @content
+        end
+      end
+    end
+  end
+end
+
+# I'm not sure whether to make Pact::Message a module or a class at this stage, so making
+# the "public interface" to the pact-support library support Pact::Message.new either way
+
+if Pact.const_defined?('Message') && Pact::Message.class == Module
+  module Pact
+    module Message
+      class Content
+        def self.new *args
+          Pact::ConsumerContract::Message::Content.new(*args)
+        end
+
+        def self.from_hash *args
+          Pact::ConsumerContract::Message::Content.from_hash(*args)
+        end
+      end
+    end
+  end
+end
+
+if Pact.const_defined?('Message') && Pact::Message.class == Class
+  module Pact
+    class Message
+      class Content
+        def self.new *args
+          Pact::ConsumerContract::Message::Content.new(*args)
+        end
+      end
+
+      def self.from_hash *args
+        Pact::ConsumerContract::Message::Content.from_hash(*args)
+      end
+    end
+  end
+end

data/lib/pact/errors.rb

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

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "1.2.99.alpha.1"
+    VERSION = "1.3.0.alpha.1"
   end
 end

data/spec/lib/pact/consumer_contract/consumer_contract_spec.rb

@@ -52,6 +52,28 @@ 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

data/spec/lib/pact/consumer_contract/message_spec_with_message_class.rb

@@ -0,0 +1,25 @@
+# I'm not sure whether to make Pact::Message a module or a class at this stage, so making
+# the "public interface" to the pact-support library support Pact::Message.new either way
+
+module Pact
+  class Message; end
+end
+
+load 'pact/consumer_contract/message.rb'
+load 'pact/consumer_contract/message/content.rb'
+
+describe Pact::Message::Content do
+  describe "new" do
+    it "returns an instance of Pact::Message::ConsumerContract::Message::Content" do
+      expect(Pact::Message::Content.new('foo')).to be_a(Pact::ConsumerContract::Message::Content)
+    end
+  end
+end
+
+describe Pact::Message do
+  describe "new" do
+    it "returns an instance of Pact::Message::ConsumerContract::Message" do
+      expect(Pact::Message.new).to be_a(Pact::ConsumerContract::Message)
+    end
+  end
+end

data/spec/lib/pact/consumer_contract/message_spec_with_message_module.rb

@@ -0,0 +1,25 @@
+# I'm not sure whether to make Pact::Message a module or a class at this stage, so making
+# the "public interface" to the pact-support library support Pact::Message.new either way
+
+module Pact
+  module Message; end
+end
+
+load 'pact/consumer_contract/message.rb'
+load 'pact/consumer_contract/message/content.rb'
+
+describe Pact::Message::Content do
+  describe "new" do
+    it "returns an instance of Pact::Message::ConsumerContract::Message::Content" do
+      expect(Pact::Message::Content.new('foo')).to be_a(Pact::ConsumerContract::Message::Content)
+    end
+  end
+end
+
+describe Pact::Message do
+  describe "new" do
+    it "returns an instance of Pact::Message::ConsumerContract::Message" do
+      expect(Pact::Message.new).to be_a(Pact::ConsumerContract::Message)
+    end
+  end
+end

data/tasks/spec.rake

@@ -2,6 +2,14 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
+RSpec::Core::RakeTask.new(:spec_with_message_class) do | task |
+  task.pattern = "spec/lib/pact/consumer_contract/message_spec_with_message_class.rb"
+end
+
+RSpec::Core::RakeTask.new(:spec_with_message_module) do | task |
+  task.pattern = "spec/lib/pact/consumer_contract/message_spec_with_message_module.rb"
+end
+
 task :set_active_support_on do
   ENV["LOAD_ACTIVE_SUPPORT"] = 'true'
 end
@@ -11,4 +19,4 @@ task :spec_with_active_support => [:set_active_support_on] do
   Rake::Task['spec'].execute
 end
 
-task :default => [:spec, :spec_with_active_support]
+task :default => [:spec, :spec_with_active_support, :spec_with_message_class, :spec_with_message_module]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 1.2.99.alpha.1
+  version: 1.3.0.alpha.1
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -240,8 +240,9 @@ files:
 - lib/pact/consumer_contract/consumer_contract.rb
 - lib/pact/consumer_contract/file_name.rb
 - lib/pact/consumer_contract/headers.rb
-- lib/pact/consumer_contract/http_consumer_contract_parser.rb
 - lib/pact/consumer_contract/interaction.rb
+- lib/pact/consumer_contract/message.rb
+- lib/pact/consumer_contract/message/content.rb
 - lib/pact/consumer_contract/pact_file.rb
 - lib/pact/consumer_contract/query.rb
 - lib/pact/consumer_contract/query_hash.rb
@@ -304,6 +305,8 @@ files:
 - spec/lib/pact/consumer_contract/file_name_spec.rb
 - spec/lib/pact/consumer_contract/headers_spec.rb
 - spec/lib/pact/consumer_contract/interaction_spec.rb
+- spec/lib/pact/consumer_contract/message_spec_with_message_class.rb
+- spec/lib/pact/consumer_contract/message_spec_with_message_module.rb
 - spec/lib/pact/consumer_contract/pact_file_spec.rb
 - spec/lib/pact/consumer_contract/query_hash_spec.rb
 - spec/lib/pact/consumer_contract/query_string_spec.rb
@@ -399,6 +402,8 @@ test_files:
 - spec/lib/pact/consumer_contract/file_name_spec.rb
 - spec/lib/pact/consumer_contract/headers_spec.rb
 - spec/lib/pact/consumer_contract/interaction_spec.rb
+- spec/lib/pact/consumer_contract/message_spec_with_message_class.rb
+- spec/lib/pact/consumer_contract/message_spec_with_message_module.rb
 - spec/lib/pact/consumer_contract/pact_file_spec.rb
 - spec/lib/pact/consumer_contract/query_hash_spec.rb
 - spec/lib/pact/consumer_contract/query_string_spec.rb

data/lib/pact/consumer_contract/http_consumer_contract_parser.rb

@@ -1,26 +0,0 @@
-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