pact-message 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4623b490060cc82d7c1349fd6119c7eb9db846be
-  data.tar.gz: 0b65825c719cb6112732fbef9ae4a7d970ff09b0
+  metadata.gz: eb08c5946bc8332b709fbe150f0a1bac91dd48ad
+  data.tar.gz: 4fe6956ee6a15e093e74f2970b953ab4cedaa671
 SHA512:
-  metadata.gz: 2410094b111d55139aa5d7680df0c17be09b2ac4977f155a202b57c96119d45656cfd558593817c577c3e4931f522316b8a65862843ed7da7dcf97869aff252d
-  data.tar.gz: d8c0cf553285955e4746b64e8703893e6870e09e094e8189f74fa95214dfe80b618fe94dde211e83ba74875768eb27981c43f7bf02d5aa19dfab7dd6c2f675fe
+  metadata.gz: 5f2b71dea1efceef4f09cd8c89e12ca9f86e18fb4b1ae43dfe93b11cb43a447055fc732ff8baf17a1a01962748f6ebcb1108b3327c4e0d7caffbc5d220eedde9
+  data.tar.gz: 8d141b680689853b612c6052bb2821d711f5f1b6b5fdde4ac6426427d18dd632f8c55121c7644aec074cb7ffb82657b8ddcff491c6e2d8bd87abb785478dfbdd

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+<a name="v0.4.0"></a>
+### v0.4.0 (2018-04-03)
+
+
+#### Features
+
+* add *partial* support for reading/writing array of provider states as specified in v3 spec	 ([e9ec6c3](/../../commit/e9ec6c3))
+
+
 <a name="v0.3.0"></a>
 ### v0.3.0 (2018-04-03)
 

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

@@ -22,6 +22,10 @@ module Pact
           end
         end
 
+        def content
+          @content
+        end
+
         def as_json
           @content
         end

data/lib/pact/consumer_contract/message.rb

@@ -28,7 +28,10 @@ module Pact
           end
           content_hash = Pact::MatchingRules.merge(hash['content'], hash['content']['matchingRules'], opts)
           content = Pact::ConsumerContract::Message::Content.from_hash(content_hash)
-          new(symbolize_keys(hash).merge(content: content))
+          provider_state = hash['providerStates'] && hash['providerStates'].first && hash['providerStates'].first['name']
+          warn_if_multiple_provider_states(provider_state, hash)
+          warn_if_params_used_in_provider_states(hash)
+          new(symbolize_keys(hash).merge(content: content, provider_state: provider_state))
         end
 
         def to_hash
@@ -114,6 +117,24 @@ module Pact
         def to_s
           to_hash.to_s
         end
+
+        private
+
+        def self.warn_if_multiple_provider_states(provider_state, hash)
+          if hash['providerStates'] && hash['providerStates'].size > 1
+            ignored_list = hash['providerStates'].collect{ |provider_state| "\"#{provider_state['name']}\"" }[1..-1].join(", ")
+            Pact.configuration.error_stream.puts("WARN: Using only the first provider state, \"#{provider_state}\", as support for multiple provider states is not yet implemented. Ignoring provider states: #{ignored_list}")
+          end
+        end
+
+        def self.warn_if_params_used_in_provider_states(hash)
+          return unless hash['providerStates']
+          provider_states_with_params = hash['providerStates'].select{ | provider_state | provider_state.fetch('params', {}).any? }
+          if provider_states_with_params.any?
+            ignored_list = provider_states_with_params.collect{ |provider_state| "\"#{provider_state['name']}\"" }.join(", ")
+            Pact.configuration.error_stream.puts("WARN: Ignoring params for the following provider states as params support is not yet implemented: #{ignored_list}")
+          end
+        end
     end
   end
 end

data/lib/pact/message/cli.rb

@@ -14,7 +14,7 @@ module Pact
         require 'pact/message'
         require 'pact/message/consumer/update_pact'
         pact_specification_version = Pact::SpecificationVersion.new(options.pact_specification_version)
-        message = Pact::Message.from_hash(JSON.parse(message), { pact_specification_version: pact_specification_version })
+        message = Pact::Message.from_hash(JSON.load(message), { pact_specification_version: pact_specification_version })
         Pact::Message::Consumer::UpdatePact.call(message, options.pact_dir, options.consumer, options.provider, options.pact_specification_version)
       end
 

data/lib/pact/message/consumer/interaction_decorator.rb

@@ -7,15 +7,16 @@ module Pact
 
         include ActiveSupportSupport
 
-        def initialize interaction, decorator_options = {}
-          @interaction = interaction
+        def initialize message, decorator_options = {}
+          @message = message
           @decorator_options = decorator_options
         end
 
         def as_json options = {}
-          hash = { :description => interaction.description }
-          hash[:providerState] = interaction.provider_state if interaction.provider_state
-          hash[:content] = decorate_content
+          hash = { :description => message.description }
+          hash[:providerStates] = provider_states if message.provider_state
+          hash[:content] = extract_content
+          hash[:matchingRules] = extract_matching_rules
           fix_all_the_things hash
         end
 
@@ -25,10 +26,28 @@ module Pact
 
         private
 
-        attr_reader :interaction
+        attr_reader :message
 
         def decorate_content
-          interaction.content.as_json
+          message.content.as_json
+        end
+
+        def extract_content
+          Pact::Reification.from_term(message.content.content)
+        end
+
+        def provider_states
+          [{ name: message.provider_state }]
+        end
+
+        def extract_matching_rules
+          {
+            body: Pact::MatchingRules.extract(message.content.content, pact_specification_version: pact_specification_version)
+          }
+        end
+
+        def pact_specification_version
+          Pact::SpecificationVersion.new(@decorator_options[:pact_specification_version])
         end
       end
     end

data/lib/pact/message/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Message
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   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.5"
+  spec.add_runtime_dependency "pact-support", "~> 1.6"
   # 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.

data/script/update-pact.sh

@@ -0,0 +1,10 @@
+bundle exec bin/pact-message update '{
+  "description": "a test mesage",
+  "content": {
+    "name": {
+      "contents": "Mary",
+      "json_class": "Pact::SomethingLike"
+    }
+  }
+}
+' --consumer Foo --provider Bar --pact-dir ./tmp --pact-specification-version 3.0.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-message
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Beth Skurrie
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: pact-mock_service
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +182,7 @@ files:
 - lib/pact/message/version.rb
 - pact-message.gemspec
 - script/release.sh
+- script/update-pact.sh
 - tasks/release.rake
 homepage: http://pact.io
 licenses: