pact 1.0.32 → 1.0.33

data/CHANGELOG.md

@@ -2,48 +2,77 @@ Do this to generate your change history
 
     git log --date=relative --pretty=format:'  * %h - %s (%an, %ad)'
 
+### 1.0.33 (13 March 2013)
+* 49456cc - Added the ability to configure modules that can be used in provider state definitions (Beth Skurrie, 75
+
+### 1.0.32 (11 March 2014)
+* 5a7cc36 - Adding as_json methods for diff indicators (index/key not found/unexpected) (Beth Skurrie, 2 days ago)
+
+### 1.0.31 (11 March 2013)
+
+* e109722 - Fixed output of pact:verify failures when active_support is loaded (Beth Skurrie, 2 days ago)
+* 90d62fb - Returning a json error with a backtrace when a StandardError occurs in the MockServer, in an at
+* 044cc71 - Using PATH_INFO instead of REQUEST_PATH as recommended by Rack spec - REQUEST_PATH isn't offici
+* e40d785 - Using webrick instead of thin to run pact service as thin does not work on jruby (Beth Skurrie, 9 days
+* ec732de - use puma instead of then as that gem works on JRuby (Ronald Holshausen, 9 days ago)
+* 8720da9 - removed ruby head from travis config as event machine gem is not building on it (Ronald Holshau
+* d46f712 - removed JRuby from Travis.ci config as JRubests can now use the pact-jvm (Ronald Holshausen, 9
+* a1b0796 - Merge pull request #5 from jessedc/patch-1 (Ronald Holshausen, 9 days ago)
+* bd1f9ed - Update link to DiUS repository. (Jesse Collis, 9 days ago)
+* 5cbe40b - Added Shokkenki link and a Google form link. (Beth Skurrie, 2 weeks ago)
+* 284481e - Updating example spec (Beth Skurrie, 2 weeks ago)
+* 346cd57 - Fixed SomethingModel example code. (Beth Skurrie, 2 weeks ago)
+* ac37919 - Adding terminology and 'reasons why pact is good' (Beth Skurrie, 10 weeks ago)
+* 49923c6 - Added FAQ about non ruby codebases. (Beth Skurrie, 2 months ago)
+* cba6409 - Splitting up the REAME into more manageable chunks (Beth Skurrie, 2 months ago)
+* 115e786 - Added diagram to help explain testing with pact (Beth Skurrie, 2 months ago)
+* 8962afe - Using Pact::DSL for provider states (Beth Skurrie, 3 months ago)
+* 77d087f - Added helper method for mock service base URL (Beth Skurrie, 3 months ago)
+* 0e7e249 - Updated example app with latest good practise pact code (Beth Skurrie, 3 months ago)
+* bf225c6 - Added documentation for standalone mock server (Beth Skurrie, 3 months ago)
+
 ### 1.0.30 (17 December 2013)
 
 * c8278c7 - Added thin into the gemspec for pact standalone mock server (Beth Skurrie, 2 minutes ago)
 
 ### 1.0.29 (12 December 2013)
 
-* 8ffde69 - Providing before :all like functionality using before :each to get the dual benefits of faster tests and the ability to use stubbing (Beth, 53 seconds ago)
+* 8ffde69 - Providing before :all like functionality using before :each to get the dual benefits of faster tests and the ability to use stubbing (Beth Skurrie, 53 seconds ago)
 * d30a78b - Added test to ensure rspec stubbing always works (Beth Skurrie, 15 hours ago)
 
 ### 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)
+* 24f9ea0 - Changed provider set up and tear down back to running in before :each, as rspec stubbing is not supported in before :all (Beth Skurrie, 15 seconds ago)
+* 825e787 - Fixing failing tests (Beth Skurrie, 4 hours ago)
+* fb6a1c8 - Moving ProviderState collection into its own class (Beth Skurrie, 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)
-* 823f306 - Update README.md (bethesque, 32 hours ago)
+* 388fc7b - Changing provider set up and tear down to run before :all rather than before :each (Beth Skurrie, 13 minutes ago)
+* 06b5626 - Updating TODO list in the README. (Beth Skurrie, 25 hours ago)
+* 823f306 - Update README.md (Beth Skurrie, 32 hours ago)
 * 7d96017 - Improving layout of text diff message (Beth Skurrie, 2 days ago)
 * 9c88c3a - Working on a new way to display the diff between an expected and actual request/response (Beth Skurrie, 2 days ago)
 * ff2c448 - Added a Difference class instead of a hash with :expected and :actual (Beth Skurrie, 2 days ago)
 * b34457c - Moved all missing provider state templates into the one message at the end of the test so it's easier to digest and can be copied directly into a file. (Beth Skurrie, 2
 * 1729887 - Moving ProviderStateProxy on to Pact World (Beth Skurrie, 3 days ago)
-* c53cb4d - Starting to add Pact::World (Beth, 4 days ago)
-* f7af9e2 - Recording missing provider states (Beth, 4 days ago)
-* 4caa171 - Starting work on ProviderStateProxy - intent is for it to record missing and unused states to report at the end of the pact:verify (Beth, 4 days ago)
+* c53cb4d - Starting to add Pact::World (Beth Skurrie, 4 days ago)
+* f7af9e2 - Recording missing provider states (Beth Skurrie, 4 days ago)
+* 4caa171 - Starting work on ProviderStateProxy - intent is for it to record missing and unused states to report at the end of the pact:verify (Beth Skurrie, 4 days ago)
 
 ### 1.0.26 (5 December 2013)
 
-* e4be654 - BEST COMMIT TO PACT EVER since the introduction of pact:verify. Got rid of the horrific backtraces. (Beth, 5 hours ago)
+* e4be654 - BEST COMMIT TO PACT EVER since the introduction of pact:verify. Got rid of the horrific backtraces. (Beth Skurrie, 5 hours ago)
 * 2810db7 - Updated README to point to realestate-com-au travis CI build (Ronald Holshausen, 28 hours ago)
-* bfa357a - Update README.md (bethesque, 30 hours ago)
+* bfa357a - Update README.md (Beth Skurrie, 30 hours ago)
 
 ### 1.0.25 (4 December 2013)
 
-* 20dd5fa - Updated the homepage in gemspec (Beth, 4 minutes ago)
+* 20dd5fa - Updated the homepage in gemspec (Beth Skurrie, 4 minutes ago)
 
 ### 1.0.24 (4 December 2013)
 
-* fd30d36 - Merge branch 'master' of github.com:uglyog/pact (Beth, 13 minutes ago)
+* fd30d36 - Merge branch 'master' of github.com:uglyog/pact (Beth Skurrie, 13 minutes ago)
 * 45430b1 - Whoops; use actual latest ruby p484, not p448 (Daniel Heath, 18 hours ago)
 * 9a999ad - Specify a non-compromised version of ruby in .ruby-version (Daniel Heath, 18 hours ago)
 * bb8d4d9 - Merge pull request #13 from stevenfarlie/update-awesome-print (Ronald Holshausen, 20 hours ago)
@@ -73,65 +102,65 @@ Do this to generate your change history
 * 1930269 - added travis CI for the uglyog repo (Ronald Holshausen, 4 days ago)
 * 7750ee1 - added travis build status image (Ronald Holshausen, 5 days ago)
 * 9f72b31 - added travis build status image (Ronald Holshausen, 5 days ago)
-* d9be65b - Added .travis.yml (Beth, 6 days ago)
-* e7a7e7b - Refactoring pact_helper loading. (Beth, 6 days ago)
-* 0224d36 - Only log loading of pact_helper once https://github.com/uglyog/pact/issues/8 (Beth, 6 days ago)
-* 0123207 - Updating gemspec description (Beth, 7 days ago)
-* 697cbdc - Updating README.md (Beth, 4 weeks ago)
+* d9be65b - Added .travis.yml (Beth Skurrie, 6 days ago)
+* e7a7e7b - Refactoring pact_helper loading. (Beth Skurrie, 6 days ago)
+* 0224d36 - Only log loading of pact_helper once https://github.com/uglyog/pact/issues/8 (Beth Skurrie, 6 days ago)
+* 0123207 - Updating gemspec description (Beth Skurrie, 7 days ago)
+* 697cbdc - Updating README.md (Beth Skurrie, 4 weeks ago)
 * ca79968 - Investigating Rack and HTTP headers in response to https://github.com/uglyog/pact/issues/6. Updated tests and README with info on multiple headers with the same name. (B
-* 01f0b9a - Updating README (Beth, 4 weeks ago)
+* 01f0b9a - Updating README (Beth Skurrie, 4 weeks ago)
 
 ### 1.0.20 (29 October 2013)
 
-  * c03f34f - Fixed the pretty generation of JSON when active support is loaded. It is both a sad and a happy moment. (Beth, 7 minutes ago)
+  * c03f34f - Fixed the pretty generation of JSON when active support is loaded. It is both a sad and a happy moment. (Beth Skurrie, 7 minutes ago)
 
 ### 1.0.19 (29 October 2013)
  * e4b990e - Gsub '-' to '_' in request headers. (Sebastian Glazebrook, 4 minutes ago)
- * 52ac8f8 - Added documentation for PACT_DESCRIPTION and PACT_PROVIDER_STATE to README. (Beth, 13 hours ago)
+ * 52ac8f8 - Added documentation for PACT_DESCRIPTION and PACT_PROVIDER_STATE to README. (Beth Skurrie, 13 hours ago)
 
 ### 1.0.18 (29 October 2013)
 
- * f2892d4 - Fixed bug where an exception is thrown when a key is not found and is attempted to be matched to a regexp (Beth, 60 seconds ago)
+ * f2892d4 - Fixed bug where an exception is thrown when a key is not found and is attempted to be matched to a regexp (Beth Skurrie, 60 seconds ago)
 
 ### 1.0.17 (29 October 2013)
 
- * 74bdf09 - Added missing require for Regexp json deserialisation (Beth, 3 minutes ago)
- * d69482e - Removed JsonWarning for ActiveSupport JSON. (Beth, 3 hours ago)
+ * 74bdf09 - Added missing require for Regexp json deserialisation (Beth Skurrie, 3 minutes ago)
+ * d69482e - Removed JsonWarning for ActiveSupport JSON. (Beth Skurrie, 3 hours ago)
  * 5f72720 - Fixing ALL THE REGEXPS that ActiveSupport JSON broke. The pact gem should now serialise and deserialise its own JSON properly even when ActiveSupport is loaded by the call
- * c3e6430 - Added config.ru parsing to best practices. (Beth, 9 hours ago)
- * ae3a70f - DRYing up pact file reading code. (Beth, 11 hours ago)
- * dc83557 - Fixing VerificationTask spec (Beth, 11 hours ago)
- * bae379c - Added consumer name, provider name and request method to output of rspec. (Beth, 12 hours ago)
- * 89c2620 - Adding spec filtering using PACT_DESCRIPTION and PACT_PROVIDER_STATE to pact:verify and pact:verify:at tasks. (Beth, 28 hours ago)
- * 7ab43a9 - Adding puts to show when pact:verify specs are being filtered. (Beth, 28 hours ago)
+ * c3e6430 - Added config.ru parsing to best practices. (Beth Skurrie, 9 hours ago)
+ * ae3a70f - DRYing up pact file reading code. (Beth Skurrie, 11 hours ago)
+ * dc83557 - Fixing VerificationTask spec (Beth Skurrie, 11 hours ago)
+ * bae379c - Added consumer name, provider name and request method to output of rspec. (Beth Skurrie, 12 hours ago)
+ * 89c2620 - Adding spec filtering using PACT_DESCRIPTION and PACT_PROVIDER_STATE to pact:verify and pact:verify:at tasks. (Beth Skurrie, 28 hours ago)
+ * 7ab43a9 - Adding puts to show when pact:verify specs are being filtered. (Beth Skurrie, 28 hours ago)
 
 ### 1.0.16 (28 October 2013)
 
-* ce0d102 - Fixing specs after adding pact_helper and changing producer_state to provider_state. There is no producer here any more! Naughty producer. (Beth, 71 seconds ago)
-* 90f7203 - Fixing bug where RSpec world was not cleared between pact:verify tasks. (Beth, 16 minutes ago)
-* b323336 - Fixed bug where pact_helper option was not being passed into the PactSpecRunner from the task configuration (Beth, 4 hours ago)
+* ce0d102 - Fixing specs after adding pact_helper and changing producer_state to provider_state. There is no producer here any more! Naughty producer. (Beth Skurrie, 71 seconds ago)
+* 90f7203 - Fixing bug where RSpec world was not cleared between pact:verify tasks. (Beth Skurrie, 16 minutes ago)
+* b323336 - Fixed bug where pact_helper option was not being passed into the PactSpecRunner from the task configuration (Beth Skurrie, 4 hours ago)
 * b1e78f5 - Added environment variable support. (Sergei Matheson, 3 days ago)
 * 2b9f39a - Allow match criteria to be passed through to pact:verify tasks on command line (Sergei Matheson, 3 days ago)
 * 2241f29 - Un-deprecating the support_file functionality after having discovered a valid use for it (project that contains two rack apps that have a pact with each other). Renamed op
-* c94fc13 - Updating example provider state (Beth, 4 days ago)
-* 6900f39 - Updating README with better client class example (Beth, 5 days ago)
+* c94fc13 - Updating example provider state (Beth Skurrie, 4 days ago)
+* 6900f39 - Updating README with better client class example (Beth Skurrie, 5 days ago)
 * e41f755 - Update README.md (bskurrie, 5 days ago)
-* 2abcce4 - Adding to pact best practices. (Beth, 5 days ago)
+* 2abcce4 - Adding to pact best practices. (Beth Skurrie, 5 days ago)
 
 ### 1.0.15 (22 October 2013)
 
- * 6800a58 - Updating README with latest TODOs (Beth, 2 hours ago)
- * 99a6827 - Improving logging in pact:verify. Fixing bug where Pact log level was ignored. (Beth, 3 hours ago)
- * 5434f54 - Updating README with best practice and information on the :pact => :verify metadata. (Beth, 4 hours ago)
- * 16dd2be - Adding :pact => :verify to pact:verify rspec examples for https://github.com/uglyog/pact/issues/3 (Beth, 5 hours ago)
+ * 6800a58 - Updating README with latest TODOs (Beth Skurrie, 2 hours ago)
+ * 99a6827 - Improving logging in pact:verify. Fixing bug where Pact log level was ignored. (Beth Skurrie, 3 hours ago)
+ * 5434f54 - Updating README with best practice and information on the :pact => :verify metadata. (Beth Skurrie, 4 hours ago)
+ * 16dd2be - Adding :pact => :verify to pact:verify rspec examples for https://github.com/uglyog/pact/issues/3 (Beth Skurrie, 5 hours ago)
 
 ### 1.0.14 (22 October 2013)
 
-* 406e746 - Added a template for the provider state when no provider state is found (Beth, 9 minutes ago)
+* 406e746 - Added a template for the provider state when no provider state is found (Beth Skurrie, 9 minutes ago)
 * 1f58be8 - Adding error messages when set_up or tear_down are not defined, and added no_op as a way to avoid having to use an empty set_up block when there is no data to set up (Beth)
 * 78d3999 - Merge pull request #2 from stuliston/json_warning_minor_refactor (Ronald Holshausen, 18 hours ago)
 * be4a466 - Altering JsonWarning so that it only warns once. Added spec to confirm that's the case. (Stuart Liston, 21 hours ago)
-* 3b11b42 - Fixing the issue where a method defined in global scope could not be accessed in the DSL delegation code (Beth, 11 days ago)
+* 3b11b42 - Fixing the issue where a method defined in global scope could not be accessed in the DSL delegation code (Beth Skurrie, 11 days ago)
 
 ### 1.0.13 (10 October 2013)
 

data/Gemfile.lock

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

data/lib/pact/provider/configuration.rb

@@ -1,5 +1,7 @@
 require 'pact/provider/pact_verification'
 require 'pact/shared/dsl'
+require 'pact/provider/provider_state_configured_modules'
+
 module Pact
 
   module Provider
@@ -42,6 +44,13 @@ module Pact
         def config_ru_path= config_ru_path
           @config_ru_path = config_ru_path
         end
+
+        def include mod
+          Pact::Provider::ProviderStateConfiguredModules.instance_eval do
+            include mod
+          end
+        end
+
       end
 
       Pact::Configuration.send(:include, ConfigurationExtension)

data/lib/pact/provider/provider_state.rb

@@ -1,4 +1,5 @@
 require 'pact/shared/dsl'
+require 'pact/provider/provider_state_configured_modules'
 
 module Pact
   module Provider
@@ -51,6 +52,8 @@ 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

data/lib/pact/provider/provider_state_configured_modules.rb

@@ -0,0 +1,7 @@
+module Pact
+  module Provider
+    module ProviderStateConfiguredModules
+      # Placeholder for modules configured using config.include
+    end
+  end
+end

data/lib/pact/version.rb

@@ -1,3 +1,3 @@
 module Pact
-  VERSION = "1.0.32"
+  VERSION = "1.0.33"
 end

data/spec/support/stubbing.rb

@@ -13,6 +13,7 @@ class App
 end
 
 Pact.provider_states_for 'Consumer' do
+
   provider_state 'something is stubbed' do
     set_up do
       StubbedThing.stub(:stub_me).and_return("stubbing works")

data/spec/support/stubbing_using_allow.rb

@@ -0,0 +1,29 @@
+require 'pact/provider/rspec'
+require 'rspec/mocks'
+
+class StubbedThing
+  def self.stub_me
+  end
+end
+
+class App
+  def self.call env
+    [200, {}, [StubbedThing.stub_me]]
+  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
+      allow(StubbedThing).to receive(:stub_me).and_return("stubbing works")
+    end
+  end
+end
+
+Pact.service_provider 'Provider' do
+  app { App }
+end

data/tasks/pact-test.rake

@@ -4,10 +4,15 @@ Pact::VerificationTask.new(:stubbing) do | pact |
 	pact.uri './spec/support/stubbing.json', :pact_helper => './spec/support/stubbing.rb'
 end
 
+Pact::VerificationTask.new(:stubbing_using_allow) do | pact |
+	pact.uri './spec/support/stubbing.json', :pact_helper => './spec/support/stubbing_using_allow.rb'
+end
+
+
 namespace :pact do
 
 	desc 'Runs pact tests against a sample application, testing failure and success.'
-	task :tests => ['pact:verify:stubbing'] do
+	task :tests => ['pact:verify:stubbing','pact:verify:stubbing_using_allow'] do
 
 		require 'pact/provider/pact_spec_runner'
 		require 'open3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.0.32
+  version: 1.0.33
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -358,6 +358,7 @@ files:
 - lib/pact/provider/pact_verification.rb
 - lib/pact/provider/print_missing_provider_states.rb
 - lib/pact/provider/provider_state.rb
+- lib/pact/provider/provider_state_configured_modules.rb
 - lib/pact/provider/provider_state_proxy.rb
 - lib/pact/provider/request.rb
 - lib/pact/provider/rspec.rb
@@ -432,6 +433,7 @@ files:
 - spec/support/shared_examples_for_request.rb
 - spec/support/stubbing.json
 - spec/support/stubbing.rb
+- spec/support/stubbing_using_allow.rb
 - spec/support/test_app_fail.json
 - spec/support/test_app_pass.json
 - tasks/pact-test.rake
@@ -516,5 +518,6 @@ test_files:
 - spec/support/shared_examples_for_request.rb
 - spec/support/stubbing.json
 - spec/support/stubbing.rb
+- spec/support/stubbing_using_allow.rb
 - spec/support/test_app_fail.json
 - spec/support/test_app_pass.json