pact 1.0.36 → 1.0.37

data/CHANGELOG.md

@@ -2,6 +2,11 @@ Do this to generate your change history
 
     git log --date=relative --pretty=format:'  * %h - %s (%an, %ad)'
 
+### 1.0.37 (19 March 2014)
+
+* 0e8b80e - Cleaned up pact:verify rspec matcher lines so the output makes more sense to the reader (bethesque, 3 minutes ago)
+* 03e5ea3 - Fixed config.include to ensure ordering of config and provider state declarations does not matter (bethesque, 20 minutes ago)
+
 ### 1.0.36 (19 March 2014)
 
 * c28de11 - Added patch level to pactSpecificationVersion (bethesque, 37 seconds ago)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pact (1.0.36)
+    pact (1.0.37)
       awesome_print (~> 1.1)
       find_a_port (~> 1.0.1)
       json

data/lib/pact/provider/rspec.rb

@@ -83,28 +83,36 @@ module Pact
 
         end
 
-        def describe_response response, interaction_context
-          # TODO : Hide the interaction_context from the output line as it is confusing
+        def describe_response expected_response, interaction_context
+
           describe "returns a response which" do
-            if response['status']
-              it "has status code #{response['status']}" do
-                expect(interaction_context.last_response.status).to eql response['status']
+
+            let(:expected_response_status) { expected_response['status'] }
+            let(:expected_response_body) { expected_response['body'] }
+            let(:response) { interaction_context.last_response }
+            let(:response_status) { response.status }
+            let(:response_body) { parse_body_from_response(response) }
+
+            if expected_response['status']
+              it "has status code #{expected_response['status']}" do
+                expect(response_status).to eql expected_response_status
               end
             end
 
-            if response['headers']
+            if expected_response['headers']
               describe "includes headers" do
-                response['headers'].each do |name, value|
-                  it "\"#{name}\" with value \"#{value}\"" do
-                    expect(interaction_context.last_response.headers[name]).to match_term value
+                expected_response['headers'].each do |name, expected_header_value|
+                  it "\"#{name}\" with value \"#{expected_header_value}\"" do
+                    header_value = response.headers[name]
+                    expect(header_value).to match_term expected_header_value
                   end
                 end
               end
             end
 
-            if response['body']
+            if expected_response['body']
               it "has a matching body" do
-                expect(parse_body_from_response(interaction_context.last_response)).to match_term response['body']
+                expect(response_body).to match_term expected_response_body
               end
             end
           end
@@ -135,10 +143,10 @@ module Pact
           @already_run = []
         end
 
-        def run_once id
-          unless @already_run.include?(id)
+        def run_once hook
+          unless @already_run.include?(hook)
             yield
-            @already_run << id
+            @already_run << hook
           end
         end
 

data/lib/pact/provider/state/provider_state.rb

@@ -77,8 +77,6 @@ module Pact
         @set_up_defined = false
         @tear_down_defined = false
         @no_op_defined = false
-        #not sure why but using include doesn't bring in the configured module methods
-        self.extend ProviderStateConfiguredModules
       end
 
       dsl do
@@ -120,12 +118,14 @@ module Pact
 
       def set_up
         if @set_up_block
+          include_provider_state_configured_modules
           instance_eval &@set_up_block
         end
       end
 
       def tear_down
         if @tear_down_block
+          include_provider_state_configured_modules
           instance_eval &@tear_down_block
         end
       end
@@ -155,6 +155,15 @@ module Pact
           "#{namespace}.#{name}"
         end
       end
+
+      def include_provider_state_configured_modules
+        # Doing this at runtime means the order of the Pact configuration block
+        # and the provider state declarations doesn't matter.
+        # Using include ProviderStateConfiguredModules on the class doesn't seem to work -
+        # modules dynamically added to ProviderStateConfiguredModules don't seem to be
+        # included in the including class.
+        self.extend(ProviderStateConfiguredModules) unless self.singleton_class.ancestors.include?(ProviderStateConfiguredModules)
+      end
     end
 
     class NoOpProviderState

data/lib/pact/version.rb

@@ -1,3 +1,3 @@
 module Pact
-  VERSION = "1.0.36"
+  VERSION = "1.0.37"
 end

data/spec/support/stubbing_using_allow.rb

@@ -12,10 +12,6 @@ class App
   end
 end
 
-Pact.configure do | config |
-  config.include RSpec::Mocks::ExampleMethods
-end
-
 Pact.provider_states_for 'Consumer' do
   provider_state 'something is stubbed' do
     set_up do
@@ -24,6 +20,13 @@ Pact.provider_states_for 'Consumer' do
   end
 end
 
+# Include the ExampleMethods module after the provider states are declared
+# to ensure the ordering doesn't matter
+
+Pact.configure do | config |
+  config.include RSpec::Mocks::ExampleMethods
+end
+
 Pact.service_provider 'Provider' do
   app { App }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.0.36
+  version: 1.0.37
   prerelease: 
 platform: ruby
 authors:
@@ -455,7 +455,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1828348959629147928
+      hash: 1047822279614111936
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -464,7 +464,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1828348959629147928
+      hash: 1047822279614111936
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23