pact-message 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 987ee7a93d7e2486be29a279820a93a7189e85ca
-  data.tar.gz: ca3015400a9b05d9af0755b80008dd722dfce8aa
+  metadata.gz: f54ca64733cb4974c13068aa5ed4412ba654c87a
+  data.tar.gz: 9ae451bed4b40ff3d547c26d9c3a118bd5c276fb
 SHA512:
-  metadata.gz: c5e295846169414dfe580899215b7d048a4c53e1feb67f27cc606f6362a6d7f6d63f74928dee765ea83316aee1316ec30cc04a4b43e8f2395c83e44b644b514d
-  data.tar.gz: 93d5e5bd4964a13f75ecc9cbbd45615480d784bc09e7c56e1d00d87ac4a85864f5cf8bb2cd8852a60944ee9d80583f2517441df663857b62d9eae8a56e6504ee
+  metadata.gz: 74890674a4e6e734ad6bbe9a61b1059e43936daf1eb5660bd4c38bb736072f7cd56bbbe371371631fdc8df884287b661058263fd76bcd5a222211ec5d3cc1656
+  data.tar.gz: c87fb12b7118e3703faae3fb21100f1d64b7cbf7e79321921997f8beb5d5253f479384bbee15fa5572e987fb6f8a5056454b2f1c439ffd90fb2d177dc854c612

data/lib/pact/consumer_contract/message.rb

@@ -21,8 +21,8 @@ module Pact
           @content = attributes[:content]
         end
 
-        def self.from_hash hash
-          content_hash = Pact::MatchingRules.merge(hash['content'], hash['content']['matchingRules'])
+        def self.from_hash hash, options
+          content_hash = Pact::MatchingRules.merge(hash['content'], hash['content']['matchingRules'], options)
           content = Pact::ConsumerContract::Message::Content.new(content_hash)
           new(symbolize_keys(hash).merge(content: content))
         end

data/lib/pact/message/consumer_contract_parser.rb

@@ -9,7 +9,8 @@ module Pact
 
       def call(hash)
         hash = symbolize_keys(hash)
-        interactions = hash[:messages].collect { |hash| Pact::ConsumerContract::Message.from_hash(hash)}
+        options = { pact_specification_version: pact_specification_version(hash) }
+        interactions = hash[:messages].collect { |hash| Pact::ConsumerContract::Message.from_hash(hash, options)}
         ConsumerContract.new(
           :consumer => ServiceConsumer.from_hash(hash[:consumer]),
           :provider => ServiceProvider.from_hash(hash[:provider]),
@@ -20,6 +21,15 @@ module Pact
       def can_parse?(hash)
         hash.key?('messages') || hash.key?(:messages)
       end
+
+      def pact_specification_version hash
+        # TODO handle all 3 ways of defining this...
+        # metadata.pactSpecificationVersion
+        maybe_pact_specification_version_1 = hash[:metadata] && hash[:metadata]['pactSpecification'] && hash[:metadata]['pactSpecification']['version']
+        maybe_pact_specification_version_2 = hash[:metadata] && hash[:metadata]['pactSpecificationVersion']
+        pact_specification_version = maybe_pact_specification_version_1 || maybe_pact_specification_version_2
+        pact_specification_version ? Pact::SpecificationVersion.new(pact_specification_version) : Pact::SpecificationVersion::NIL_VERSION
+      end
     end
   end
 end

data/lib/pact/message/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Message
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/pact-message.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "pact-support", "1.2.99.alpha.1"
+  spec.add_runtime_dependency "pact-support", "~> 1.5"
   # pact-mock_service dependencies are Pact::ConsumerContractDecorator
   # and Pact::ConsumerContractWriter. Potentially we should extract
   # or duplicate these classes to remove the pact-mock_service dependency.

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pact-message
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Beth Skurrie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pact-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.99.alpha.1
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.99.alpha.1
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: pact-mock_service
   requirement: !ruby/object:Gem::Requirement