pact-support 1.7.2 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c575784ba0803bdeccb12e271ffdec723771497
-  data.tar.gz: a81a629772d07d9ba46da3be40d461a4906c667c
+  metadata.gz: 2e798766a40ccdcb43c8aed0bfbb4ee222c266db
+  data.tar.gz: fb9ab7ab4bac90b552b8c993ff582f035b5a9e00
 SHA512:
-  metadata.gz: af8f2fd481a2b5886b6369883d1f4ea696406d16cfc55024958116cc2b170548e4271a1a37125ceddba76be643bf2a8c58ac7d4e5fd17f2fc887002e085a360d
-  data.tar.gz: 31127041531129db0c31928c8c17bedf54566133bf886725e6db5285a9676c19185767f5f86ff784a7a5a1cfdcf059564e5eae08a5b693c63ce77d5d247e8bc5
+  metadata.gz: 3d0363e0c4f19d960c4301cb96918d0eed195bd149eef1f4ce0ea4707c7629abf24a7c496e1918fb73f7b806bfea730e5a28397b972ea69a947e332bd2cd7cff
+  data.tar.gz: 0ec07b703a4abe989d0507d2f91f0aa96a76b16142e2115abca1ca355d1b0e4333e733c9d0f9142c33674116995a907ca58781d0b07ba970625253a4eebe1df6

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="v1.8.0"></a>
+### v1.8.0 (2018-10-01)
+
+
+#### Features
+
+* **v3**
+  * parse array of provider states with params	 ([4471df3](/../../commit/4471df3))
+
+
 <a name="v1.7.2"></a>
 ### v1.7.2 (2018-08-09)
 

data/lib/pact/consumer_contract/interaction.rb

@@ -5,13 +5,14 @@ module Pact
   class Interaction
     include ActiveSupportSupport
 
-    attr_accessor :description, :request, :response, :provider_state
+    attr_accessor :description, :request, :response, :provider_state, :provider_states
 
     def initialize attributes = {}
       @description = attributes[:description]
       @request = attributes[:request]
       @response = attributes[:response]
       @provider_state = attributes[:provider_state] || attributes[:providerState]
+      @provider_states = attributes[:provider_states]
     end
 
     def self.from_hash hash, options = {}
@@ -19,12 +20,17 @@ module Pact
     end
 
     def to_hash
-      {
-        description: description,
-        provider_state: provider_state,
-        request: request.to_hash,
-        response: response.to_hash
-      }
+      h = { description: description }
+
+      if provider_states
+        h[:provider_states] = provider_states.collect(&:to_hash)
+      else
+        h[:provider_state] = provider_state
+      end
+
+      h[:request] = request.to_hash
+      h[:response] = response.to_hash
+      h
     end
 
     def http?

data/lib/pact/consumer_contract/interaction_v2_parser.rb

@@ -1,5 +1,6 @@
 require 'pact/consumer_contract/request'
 require 'pact/consumer_contract/response'
+require 'pact/consumer_contract/provider_state'
 require 'pact/symbolize_keys'
 require 'pact/matching_rules'
 require 'pact/errors'
@@ -12,7 +13,8 @@ module Pact
     def self.call hash, options
       request = parse_request(hash['request'], options)
       response = parse_response(hash['response'], options)
-      Interaction.new(symbolize_keys(hash).merge(request: request, response: response))
+      provider_states = parse_provider_states(hash['providerState'] || hash['provider_state'])
+      Interaction.new(symbolize_keys(hash).merge(request: request, response: response, provider_states: provider_states))
     end
 
     def self.parse_request request_hash, options
@@ -24,5 +26,9 @@ module Pact
       response_hash = Pact::MatchingRules.merge(response_hash, response_hash['matchingRules'], options)
       Pact::Response.from_hash(response_hash)
     end
+
+    def self.parse_provider_states provider_state_name
+      provider_state_name ? [Pact::ProviderState.new(provider_state_name)] : []
+    end
   end
 end

data/lib/pact/consumer_contract/interaction_v3_parser.rb

@@ -1,5 +1,6 @@
 require 'pact/consumer_contract/request'
 require 'pact/consumer_contract/response'
+require 'pact/consumer_contract/provider_state'
 require 'pact/symbolize_keys'
 require 'pact/matching_rules'
 require 'pact/errors'
@@ -13,7 +14,12 @@ module Pact
     def self.call hash, options
       request = parse_request(hash['request'], options)
       response = parse_response(hash['response'], options)
-      Interaction.new(symbolize_keys(hash).merge(request: request, response: response))
+      provider_states = parse_provider_states(hash['providerStates'])
+      provider_state = provider_states.any? ? provider_states.first.name : nil
+      if provider_states && provider_states.size > 1
+        Pact.configuration.error_stream.puts("WARN: Currently only 1 provider state is supported. Ignoring ")
+      end
+      Interaction.new(symbolize_keys(hash).merge(request: request, response: response, provider_states: provider_states, provider_state: provider_state))
     end
 
     def self.parse_request request_hash, options
@@ -57,5 +63,11 @@ module Pact
       string_with_matching_rules = StringWithMatchingRules.new(response_hash['body'], options[:pact_specification_version], response_matching_rules)
       Pact::Response.from_hash(response_hash.merge('body' => string_with_matching_rules))
     end
+
+    def self.parse_provider_states provider_states
+      (provider_states || []).collect do | provider_state_hash |
+        Pact::ProviderState.new(provider_state_hash['name'], provider_state_hash['params'])
+      end
+    end
   end
 end

data/lib/pact/consumer_contract/provider_state.rb

@@ -0,0 +1,34 @@
+module Pact
+  class ProviderState
+
+    attr_reader :name, :params
+
+    def initialize name, params = {}
+      @name = name
+      @params = params
+    end
+
+    def self.from_hash(hash)
+      new(hash["name"], hash["params"])
+    end
+
+    def ==(other)
+      other.is_a?(Pact::ProviderState) && other.name == self.name && other.params == self.params
+    end
+
+    def to_hash
+      {
+        "name" => name,
+        "params" => params
+      }
+    end
+
+    def to_json(opts = {})
+      as_json(opts).to_json(opts)
+    end
+
+    def as_json(opts = {})
+      to_hash
+    end
+  end
+end

data/lib/pact/consumer_contract/query.rb

@@ -3,7 +3,6 @@ require 'pact/consumer_contract/query_string'
 
 module Pact
   class Query
-
     def self.create query
       if query.is_a? Hash
         Pact::QueryHash.new(query)
@@ -11,6 +10,5 @@ module Pact
         Pact::QueryString.new(query)
       end
     end
-
   end
 end

data/lib/pact/consumer_contract/query_hash.rb

@@ -47,6 +47,10 @@ module Pact
       @hash && @hash.empty?
     end
 
+    def to_hash
+      @hash
+    end
+
     private
 
     def convert_to_hash_of_arrays(query)

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "1.7.2"
+    VERSION = "1.8.0"
   end
 end

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

@@ -38,12 +38,14 @@ module Pact
 
       describe "matches_criteria?" do
         subject { InteractionFactory.create(:description => 'a request for food') }
+
         context "by description" do
           context "when the interaction matches" do
             it "returns true" do
               expect(subject.matches_criteria?(:description => /request.*food/)).to be true
             end
           end
+
           context "when the interaction does not match" do
             it "returns false" do
               expect(subject.matches_criteria?(:description => /blah/)).to be false
@@ -52,10 +54,7 @@ module Pact
         end
       end
 
-
-
       describe "request_modifies_resource_without_checking_response_body?" do
-
         let(:interaction) { Interaction.new(request: request, response: response)}
 
         subject { interaction.request_modifies_resource_without_checking_response_body?}

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

@@ -0,0 +1,54 @@
+require 'pact/consumer_contract/interaction_v2_parser'
+
+module Pact
+  describe InteractionV2Parser do
+    describe ".call" do
+      let(:interaction_hash) do
+        {
+          "description" => "description",
+          "request" => { "method" => "GET", "path" => "/" },
+          "response" => { "status" => 200 },
+          "providerState" => "foo"
+        }
+      end
+
+      let(:options) do
+        {
+          pact_specification_version: Pact::SpecificationVersion.new("3.0")
+        }
+      end
+
+      subject { InteractionV2Parser.call(interaction_hash, options) }
+
+      describe "provider_states" do
+        it "returns an array of provider states with size 1" do
+          expect(subject.provider_states.size).to eq 1
+        end
+
+        it "sets the name of the provider state to the string provided" do
+          expect(subject.provider_states.first.name)
+        end
+
+        it "sets the params to an empty hash" do
+          expect(subject.provider_states.first.params).to eq({})
+        end
+
+        context "when the providerState is nil" do
+          before do
+            interaction_hash["providerState"] = nil
+          end
+
+          it "returns an empty list" do
+            expect(subject.provider_states).to be_empty
+          end
+        end
+      end
+
+      describe "provider_state" do
+        it "sets the name from the hash" do
+          expect(subject.provider_state).to eq "foo"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+require 'pact/consumer_contract/interaction_v3_parser'
+
+module Pact
+  describe InteractionV3Parser do
+    describe ".call" do
+
+      let(:interaction_hash) do
+        {
+          "description" => "description",
+          "request" => { "method" => "GET", "path" => "/" },
+          "response" => { "status" => 200 },
+          "providerStates" => [{
+            "name" => "foo",
+            "params" => {"a" => "b"}
+          }]
+        }
+      end
+
+      let(:options) do
+        {
+          pact_specification_version: Pact::SpecificationVersion.new("3.0")
+        }
+      end
+
+      subject { InteractionV3Parser.call(interaction_hash, options) }
+
+      describe "provider_states" do
+        it "parses the array of provider states" do
+          expect(subject.provider_states.size).to eq 1
+        end
+
+        it "parses the name of each" do
+          expect(subject.provider_states.first.name)
+        end
+
+        it "parses the params of each" do
+          expect(subject.provider_states.first.params).to eq "a" => "b"
+        end
+      end
+
+      describe "provider_state" do
+        it "sets the provider_state string to the name of the first providerState for backwards compatibility while we implement v3" do
+          expect(subject.provider_state).to eq "foo"
+        end
+      end
+    end
+  end
+end

data/spec/support/factories.rb

@@ -40,6 +40,11 @@ class InteractionFactory
             'body' => {a: 'response body'}
         }
     }
+
+    if hash.key?(:provider_states) || hash.key?('provider_states')
+      defaults.delete('provider_state')
+    end
+
     Pact::Interaction.from_hash(stringify_keys(deep_merge(defaults, stringify_keys(hash))))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.8.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -274,6 +274,7 @@ files:
 - lib/pact/consumer_contract/interaction_v2_parser.rb
 - lib/pact/consumer_contract/interaction_v3_parser.rb
 - lib/pact/consumer_contract/pact_file.rb
+- lib/pact/consumer_contract/provider_state.rb
 - lib/pact/consumer_contract/query.rb
 - lib/pact/consumer_contract/query_hash.rb
 - lib/pact/consumer_contract/query_string.rb
@@ -348,6 +349,8 @@ files:
 - spec/lib/pact/consumer_contract/http_consumer_contract_parser_spec.rb
 - spec/lib/pact/consumer_contract/interaction_parser_spec.rb
 - spec/lib/pact/consumer_contract/interaction_spec.rb
+- spec/lib/pact/consumer_contract/interaction_v2_parser_spec.rb
+- spec/lib/pact/consumer_contract/interaction_v3_parser_spec.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
@@ -456,6 +459,8 @@ test_files:
 - spec/lib/pact/consumer_contract/http_consumer_contract_parser_spec.rb
 - spec/lib/pact/consumer_contract/interaction_parser_spec.rb
 - spec/lib/pact/consumer_contract/interaction_spec.rb
+- spec/lib/pact/consumer_contract/interaction_v2_parser_spec.rb
+- spec/lib/pact/consumer_contract/interaction_v3_parser_spec.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