pact 1.0.27 → 1.0.28

data/CHANGELOG.md

@@ -2,7 +2,13 @@ Do this to generate your change history
 
     git log --date=relative --pretty=format:'  * %h - %s (%an, %ad)'
 
-### 1.0.26 (10 December 2013)
+### 1.0.28 (11 December 2013)
+
+* 24f9ea0 - Changed provider set up and tear down back to running in before :each, as rspec stubbing is not supported in before :all (Beth, 15 seconds ago)
+* 825e787 - Fixing failing tests (Beth, 4 hours ago)
+* fb6a1c8 - Moving ProviderState collection into its own class (Beth, 6 hours ago)
+
+### 1.0.27 (10 December 2013)
 
 * 388fc7b - Changing provider set up and tear down to run before :all rather than before :each (Beth, 13 minutes ago)
 * 06b5626 - Updating TODO list in the README. (Beth, 25 hours ago)

data/Gemfile.lock

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

data/lib/pact/provider/provider_state.rb

@@ -3,21 +3,17 @@ module Pact
 
     module DSL
       def provider_state name, &block
-        ProviderState.provider_state(name, &block).register
+        ProviderStates.provider_state(name, &block).register
       end
 
       def provider_states_for name, &block
-        ProviderState.current_namespaces << name
+        ProviderStates.current_namespaces << name
         instance_eval(&block)
-        ProviderState.current_namespaces.pop
+        ProviderStates.current_namespaces.pop
       end
     end
 
-    class ProviderState
-
-      attr_accessor :name
-      attr_accessor :namespace
-
+    class ProviderStates
       def self.provider_state name, &block
         ProviderState.new(name, current_namespaces.join('.'), &block)
       end
@@ -38,9 +34,16 @@ module Pact
         fullname = options[:for] ? "#{options[:for]}.#{name}" : name
         (provider_states[fullname] || provider_states[fullname.to_sym]) || provider_states[name]
       end
+    end
+
+    class ProviderState
+
+      attr_accessor :name
+      attr_accessor :namespace
+
 
       def register
-        self.class.register(namespaced(name), self)
+        ProviderStates.register(namespaced(name), self)
       end
 
       def initialize name, namespace, &block

data/lib/pact/provider/provider_state_proxy.rb

@@ -9,7 +9,7 @@ module Pact
       end
 
       def get name, options = {}
-        unless provider_state = ProviderState.get(name, options)
+        unless provider_state = ProviderStates.get(name, options)
           register_missing_provider_state name, options[:for]
           raise error_message name, options[:for]
         end

data/lib/pact/provider/rspec.rb

@@ -62,12 +62,12 @@ module Pact
 
           describe description_for(interaction), :pact => :verify do
 
-            before :all do
+            before do
               set_up_provider_state interaction.provider_state, options[:consumer]
               replay_interaction interaction
             end
 
-            after :all do
+            after do
               tear_down_provider_state interaction.provider_state, options[:consumer]
             end
 

data/lib/pact/version.rb

@@ -1,3 +1,3 @@
 module Pact
-  VERSION = "1.0.27"
+  VERSION = "1.0.28"
 end

data/spec/features/production_spec.rb

@@ -75,7 +75,7 @@ module Pact::Provider
     }
     EOS
 
-    before do
+    before :all do
         Pact.service_provider "My Provider" do
             app { ServiceUnderTest.new }
         end
@@ -109,7 +109,7 @@ module Pact::Provider
         }
         EOS
 
-        before do
+        before :all do
             Pact.service_provider "My Provider" do
                 app { ServiceUnderTestWithFixture.new }
             end
@@ -141,7 +141,7 @@ module Pact::Provider
         }
         EOS
 
-        before do
+        before :all do
             Pact.service_provider "ServiceUnderTestWithFixture" do
                 app { ServiceUnderTestWithFixture.new }
             end

data/spec/lib/pact/provider/provider_state_proxy_spec.rb

@@ -15,12 +15,12 @@ module Pact
         subject { provider_state_proxy.get name, options }
 
         before do
-          ProviderState.stub(:get).and_return(provider_state)
+          ProviderStates.stub(:get).and_return(provider_state)
         end
         context "when the provider state exists" do
 
           it "retrieves the provider state from ProviderState" do
-            ProviderState.should_receive(:get).with(name, options).and_return(provider_state)
+            ProviderStates.should_receive(:get).with(name, options).and_return(provider_state)
             subject
           end
 

data/spec/lib/pact/provider/provider_state_spec.rb

@@ -25,7 +25,7 @@ module Pact
         MESSAGES.clear
       end
 
-      subject { ProviderState.get('no_alligators') }
+      subject { ProviderStates.get('no_alligators') }
 
       describe 'set_up' do
         it 'should call the block passed to set_up' do
@@ -44,12 +44,12 @@ module Pact
       describe '.get' do
         context 'when the name is a matching symbol' do
           it 'will return the ProviderState' do
-            ProviderState.get('no_alligators').should_not be_nil
+            ProviderStates.get('no_alligators').should_not be_nil
           end
         end
         context 'when the name is a matching string' do
           it 'will return the ProviderState' do
-            ProviderState.get('some alligators').should_not be_nil
+            ProviderStates.get('some alligators').should_not be_nil
           end
         end
       end
@@ -61,8 +61,8 @@ module Pact
           Pact.provider_state 'with_no_op' do
             no_op
           end
-          ProviderState.get('with_no_op').set_up
-          ProviderState.get('with_no_op').tear_down
+          ProviderStates.get('with_no_op').set_up
+          ProviderStates.get('with_no_op').tear_down
         end
       end
       context "when a no_op is defined with a set_up" do
@@ -118,11 +118,11 @@ module Pact
       describe '.get' do
         context 'for a consumer' do
           it 'has a namespaced name' do
-            ProviderState.get('the weather is sunny', :for => 'a consumer').should_not be_nil
+            ProviderStates.get('the weather is sunny', :for => 'a consumer').should_not be_nil
           end
 
           it 'falls back to a global state of the same name if one is not found for the specified consumer' do
-            ProviderState.get('the weather is cloudy', :for => 'a consumer').should_not be_nil
+            ProviderStates.get('the weather is cloudy', :for => 'a consumer').should_not be_nil
           end
         end
 
@@ -131,7 +131,7 @@ module Pact
       describe 'set_up' do
         context 'for a consumer' do
           it 'runs its own setup' do
-            ProviderState.get('the weather is sunny', :for => 'a consumer').set_up
+            ProviderStates.get('the weather is sunny', :for => 'a consumer').set_up
             NAMESPACED_MESSAGES.should eq ['sunny!']
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.0.27
+  version: 1.0.28
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -434,7 +434,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4188255095502066512
+      hash: -54424747332292177
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -443,7 +443,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4188255095502066512
+      hash: -54424747332292177
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23