pact 1.0.15 → 1.0.18

data/lib/pact/term.rb

@@ -1,6 +1,11 @@
+require 'pact/consumer_contract/active_support_support'
+require 'json/add/regexp'
+
 module Pact
   class Term
 
+    include Pact::ActiveSupportSupport
+
     attr_reader :generate, :matcher
 
     def self.json_create(obj)
@@ -15,8 +20,17 @@ module Pact
       raise "Value to generate \"#{@generate}\" does not match regular expression #{@matcher}" unless @generate =~ @matcher
     end
 
+    def to_hash
+      { json_class: self.class.name, data: { generate: generate, matcher: fix_regexp(matcher)} }
+    end
+
+    def as_json(options = {})
+      to_hash
+    end
+
+
     def to_json(options = {})
-      { json_class: self.class.name, data: { generate: generate, matcher: matcher} }.to_json(options)
+      as_json.to_json(options)
     end
 
     def match(literal)

data/lib/pact/version.rb

@@ -1,3 +1,3 @@
 module Pact
-  VERSION = "1.0.15"
+  VERSION = "1.0.18"
 end

data/lib/tasks/pact.rake

@@ -10,10 +10,11 @@ namespace :pact do
     include Pact::TaskHelper
 
     handle_verification_failure do
+      options = {criteria: spec_criteria}
       pact_verifications = Pact.configuration.pact_verifications
       verification_configs = pact_verifications.collect { | pact_verification | { :uri => pact_verification.uri }}
       raise "Please configure a pact to verify" if verification_configs.empty?
-      Pact::Provider::PactSpecRunner.new(verification_configs).run
+      Pact::Provider::PactSpecRunner.new(verification_configs, options).run
     end
   end
 
@@ -26,7 +27,8 @@ namespace :pact do
 
     handle_verification_failure do
       puts "Verifying pact at uri #{args[:pact_uri]}"
-      Pact::Provider::PactSpecRunner.new([{uri: args[:pact_uri]}]).run
+      options = {criteria: spec_criteria}
+      Pact::Provider::PactSpecRunner.new([{uri: args[:pact_uri]}], options).run
     end
   end
 

data/pact.gemspec

@@ -27,11 +27,12 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'thin'
   gem.add_runtime_dependency 'json' #Not locking down a version because buncher gem requires 1.6, while other projects use 1.7.
 
-  gem.add_development_dependency 'geminabox-client'
   gem.add_development_dependency 'rake', '~> 10.0.3'
   gem.add_development_dependency 'webmock', '~> 1.9.3'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'fakefs', '~> 0.4'
   gem.add_development_dependency 'hashie', '~> 2.0'
   gem.add_development_dependency 'rspec-fire'
+  gem.add_development_dependency 'activesupport'
+  gem.add_development_dependency 'debugger'
 end

data/spec/features/production_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'pact/provider/rspec'
 require 'pact/consumer_contract'
 require 'features/provider_states/zebras'

data/spec/integration/consumer_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'net/http'
 require 'pact/consumer'
 require 'pact/consumer/rspec'

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

@@ -0,0 +1,43 @@
+require 'spec_helper'
+require 'pact/consumer_contract/active_support_support'
+
+module Pact
+  describe ActiveSupportSupport do
+
+    include ActiveSupportSupport
+
+
+    describe "fix_regexp" do
+      let(:regexp) { /moose/ }
+
+      subject { fix_regexp regexp }
+
+      it "returns the original regexp" do
+        expect(subject).to be(regexp)
+      end
+
+      it "fixes the as_json method for Regexp that ActiveSupport tramples beneath its destructive hooves of destruction" do
+        expect(subject.to_json).to eq("{\"json_class\":\"Regexp\",\"o\":0,\"s\":\"moose\"}")
+      end
+    end
+
+    describe "fix_all_the_things" do
+      let(:hash) do
+        { 'body' => Pact::Term.new(matcher: /a*b/, generate: 'abba'), array: [/blah/], thing: /alligator/ }
+      end
+
+      subject { fix_all_the_things(hash) }
+
+      it "returns the original object" do
+        expect(subject).to be(hash)
+      end
+
+      it "finds all the Regexp objects in hashes or Pact class attributes and fixes the as_json method" do
+        json = subject.to_json
+        expect(json).to include("{\"json_class\":\"Regexp\",\"o\":0,\"s\":\"a*b\"}")
+        expect(json).to include("{\"json_class\":\"Regexp\",\"o\":0,\"s\":\"blah\"}")
+        expect(json).to include("{\"json_class\":\"Regexp\",\"o\":0,\"s\":\"alligator\"}")
+      end
+    end
+  end
+end

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

@@ -191,7 +191,7 @@ eos
       end
 
       it "should write the interactions to the file" do
-        File.read(expected_pact_path).should eql expected_pact_string.strip
+        File.read(expected_pact_path).gsub(/\s+/, '').should eql expected_pact_string.strip.gsub(/\s+/, '')
       end
     end
   end

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

@@ -28,7 +28,7 @@ module Pact
         context "by description" do
           context "when the interaction matches" do
             it "returns true" do
-              expect(subject.matches_criteria?(:description => /request.*food/)).to be_true 
+              expect(subject.matches_criteria?(:description => /request.*food/)).to be_true
             end
           end
           context "when the interaction does not match" do
@@ -52,10 +52,10 @@ module Pact
 
         let(:response) do
           { baz: /qux/, wiffle: Term.new(generate: 'wiffle', matcher: /iff/) }
-        end        
+        end
 
         let(:parsed_result) do
-          JSON.load(JSON.dump(subject))
+          JSON.load(subject.to_json)
         end
 
         subject { Interaction.from_hash('response' => response, 'request' => request) }

data/spec/lib/pact/matchers/matchers_spec.rb

@@ -38,6 +38,15 @@ describe Pact::Matchers do
     end
   end
 
+  describe "expecting a string matching a regexp and not finding key" do
+    let(:expected) { {a: /b/} }
+    let(:actual) { {} }
+    let(:difference) { {:a=>{:expected=>/b/, :actual=> Pact::KeyNotFound.new }} }
+    it "returns the diff" do
+      expect(diff(expected, actual)).to eq difference
+    end
+  end
+
   describe 'structure_diff' do
     let(:expected) {
       {a: 'a string', b: 1, c: nil, d: [{e: 'thing'}], f: {g: 10}, h: false}
@@ -153,7 +162,7 @@ describe Pact::Matchers do
       let(:difference) { [Pact::Matchers::NO_DIFF_INDICATOR, {expected: Pact::UnexpectedIndex.new , actual: 2}] }
       it 'returns the diff' do
         expect(diff(subject, actual)).to eq(difference)
-      end      
+      end
     end
 
     context 'where an expected value is a non-empty string' do

data/spec/lib/pact/verification_task_spec.rb

@@ -2,85 +2,108 @@ require 'spec_helper'
 require 'pact/tasks/verification_task'
 
 module Pact
-	describe VerificationTask do
-		before :all do
-			@support_file = '/custom/path/support_file.rb'
-			@pact_uri = 'http://example.org/pact.json'
-			@task_name = 'pact:verify:pact_rake_spec'
-			@task_name_with_explict_support_file = 'pact:verify:pact_rake_spec_with_explict_support_file'
-			@consumer = 'some-consumer'
-
-			VerificationTask.new(:pact_rake_spec_with_explict_support_file) do | pact |
-				pact.uri @pact_uri, support_file: @support_file
-			end
-
-			VerificationTask.new(:pact_rake_spec) do | pact |
-				pact.uri @pact_uri
-			end
-		end
-
-		before do
-			VerificationTask.any_instance.stub(:publish_report)
-			Provider::PactSpecRunner.stub(:new).with(consumer_contract).and_return(pact_spec_runner)
-		end
-
-		let(:pact_spec_runner) { double('PactSpecRunner', :run => exit_code, :output => nil)}
-		let(:exit_code) {0}
-		let(:consumer_contract) { [ uri: @pact_uri, support_file: nil ] }
-
-
-		describe '.initialize' do
-			context 'with an explict support_file' do
-				it 'creates the tasks' do
-					Rake::Task.tasks.should include_task @task_name
-				end
-			end
-			context 'with no explict support_file' do
-				it 'creates the tasks' do
-					Rake::Task.tasks.should include_task @task_name_with_explict_support_file
-				end
-			end
-		end
-
-		describe 'execute' do
-
-
-			context "with no explict support file " do
-				it 'verifies the pacts using PactSpecRunner' do
-					Rake::Task[@task_name].execute
-				end
-			end
-
-			context "with an explict support_file" do
-				let(:consumer_contract) { [ uri: @pact_uri, support_file: @support_file] }
-				it 'verifies the pacts using PactSpecRunner' do
-					Rake::Task[@task_name_with_explict_support_file].execute
-				end
-			end
-
-			context 'when all specs pass' do
-
-				it 'does not raise an exception' do
-					Rake::Task[@task_name].execute
-				end
-			end
-
-			context 'when one or more specs fail' do
-
-				let(:exit_code) {1}
-
-				it 'raises an exception' do
-					$stderr.should_receive(:puts) #Confusing if this shows on the screen!
-					expect { Rake::Task[@task_name].execute }.to raise_error RuntimeError
-				end
-
-			end
-		end
-	end
+  describe VerificationTask do
+    before :all do
+      @support_file = nil
+      @pact_helper = '/custom/path/support_file.rb'
+      @pact_uri = 'http://example.org/pact.json'
+      @task_name = 'pact:verify:pact_rake_spec'
+      @task_name_with_explict_support_file = 'pact:verify:pact_rake_spec_with_explict_support_file'
+      @consumer = 'some-consumer'
+      @criteria = {:description => /wiffle/}
+
+      VerificationTask.new(:pact_rake_spec_with_explict_support_file) do | pact |
+        pact.uri @pact_uri, support_file: @support_file, pact_helper: @pact_helper
+      end
+
+      VerificationTask.new(:pact_rake_spec) do | pact |
+        pact.uri @pact_uri
+      end
+    end
+
+    after :each do
+      ENV.delete 'PACT_DESCRIPTION'
+    end
+
+    before do
+      ENV['PACT_DESCRIPTION'] = 'wiffle'
+      VerificationTask.any_instance.stub(:publish_report)
+      Provider::PactSpecRunner.stub(:new).with(consumer_contract, options).and_return(pact_spec_runner)
+    end
+
+    let(:pact_spec_runner) { double('PactSpecRunner', :run => exit_code, :output => nil)}
+    let(:exit_code) {0}
+    let(:consumer_contract) { [ uri: @pact_uri, support_file: nil, pact_helper: nil ] }
+    let(:options) { {criteria: @criteria} }
+
+
+    describe '.initialize' do
+      context 'with an explict support_file' do
+        it 'creates the tasks' do
+          Rake::Task.tasks.should include_task @task_name
+        end
+      end
+      context 'with no explict support_file' do
+        it 'creates the tasks' do
+          Rake::Task.tasks.should include_task @task_name_with_explict_support_file
+        end
+      end
+    end
+
+    describe 'execute' do
+
+
+      context "with no explicit support file " do
+        it 'verifies the pacts using PactSpecRunner' do
+          Rake::Task[@task_name].execute
+        end
+      end
+
+      context "with an explict support_file" do
+        let(:consumer_contract) { [ uri: @pact_uri, support_file: @support_file, pact_helper: @pact_helper] }
+        it 'verifies the pacts using PactSpecRunner' do
+          Rake::Task[@task_name_with_explict_support_file].execute
+        end
+      end
+
+      context "with criteria" do
+        it 'passes the criteria to the PactSpecRunner as regexes' do
+          ENV.delete 'PACT_DESCRIPTION'
+          Provider::PactSpecRunner.should_receive(:new).with(
+            consumer_contract, {
+              criteria: {
+                description: /stuff/,
+                provider_state: /things/
+              }
+            }
+          ).and_return(pact_spec_runner)
+          Rake::Task[@task_name].execute(description: 'stuff', provider_state: 'things')
+        end
+      end
+
+      context 'when all specs pass' do
+
+        it 'does not raise an exception' do
+          Rake::Task[@task_name].execute
+        end
+      end
+
+      context 'when one or more specs fail' do
+
+        let(:exit_code) {1}
+
+        it 'raises an exception' do
+          $stderr.should_receive(:puts) #Confusing if this shows on the screen!
+          expect { Rake::Task[@task_name].execute }.to raise_error RuntimeError
+        end
+
+      end
+    end
+  end
 end
 
 RSpec::Matchers.define :include_task do |expected|
-	match do |actual|
-	  actual.any? { |task| task.name == expected }
-	end
-end
+  match do |actual|
+    actual.any? { |task| task.name == expected }
+  end
+end

data/spec/spec_helper.rb

@@ -8,7 +8,18 @@ require_relative 'support/factories'
 
 WebMock.disable_net_connect!(allow_localhost: true)
 
+if ENV['LOAD_ACTIVE_SUPPORT']
+   puts 'LOADING ACTIVE SUPPORT!!!! Hopefully it all still works'
+   require 'active_support/all'
+   require 'active_support'
+   require 'active_support/json'
+end
+
 RSpec.configure do | config |
   config.include(FakeFS::SpecHelpers, :fakefs => true)
   config.include(RSpec::Fire)
+
+  config.extend Pact::Provider::RSpec::ClassMethods
+  config.include Pact::Provider::RSpec::InstanceMethods
+  config.include Pact::Provider::TestMethods
 end

data/tasks/pact-test.rake

@@ -14,7 +14,7 @@ namespace :pact do
 		result = Pact::Provider::PactSpecRunner.new([{ uri: './spec/support/test_app_pass.json' }], silent: silent).run
 		fail 'Expected pact to pass' unless (result == 0)
 
-		result = Pact::Provider::PactSpecRunner.new([{ uri: './spec/support/test_app_fail.json', support_file: './spec/support/pact_helper.rb' }], silent: silent).run
+		result = Pact::Provider::PactSpecRunner.new([{ uri: './spec/support/test_app_fail.json', pact_helper: './spec/support/pact_helper.rb' }], silent: silent).run
 		fail 'Expected pact to fail' if (result == 0)
 
 		expect_to_pass "bundle exec rake pact:verify"

data/tasks/spec.rake

@@ -0,0 +1,8 @@
+task :set_active_support_on do
+  ENV["LOAD_ACTIVE_SUPPORT"] = 'true'
+end
+
+desc "This is to ensure that the gem still works even when active support JSON is loaded."
+task :spec_with_active_support => [:set_active_support_on] do
+  Rake::Task['spec'].execute
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -143,22 +143,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: geminabox-client
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -255,6 +239,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Define a pact between service consumers and providers
 email:
 - james.fraser@alumni.swinburne.edu
@@ -316,12 +332,12 @@ files:
 - lib/pact/consumer/rspec.rb
 - lib/pact/consumer/server.rb
 - lib/pact/consumer_contract.rb
+- lib/pact/consumer_contract/active_support_support.rb
 - lib/pact/consumer_contract/consumer_contract.rb
 - lib/pact/consumer_contract/interaction.rb
 - lib/pact/consumer_contract/request.rb
 - lib/pact/consumer_contract/service_consumer.rb
 - lib/pact/consumer_contract/service_provider.rb
-- lib/pact/json_warning.rb
 - lib/pact/logging.rb
 - lib/pact/matchers.rb
 - lib/pact/matchers/index_not_found.rb
@@ -372,10 +388,10 @@ files:
 - spec/lib/pact/consumer/mock_service_interaction_expectation_spec.rb
 - spec/lib/pact/consumer/request_spec.rb
 - spec/lib/pact/consumer/service_consumer_spec.rb
+- spec/lib/pact/consumer_contract/active_support_support_spec.rb
 - spec/lib/pact/consumer_contract/consumer_contract_spec.rb
 - spec/lib/pact/consumer_contract/interaction_spec.rb
 - spec/lib/pact/consumer_contract/request_spec.rb
-- spec/lib/pact/json_warning_spec.rb
 - spec/lib/pact/matchers/matchers_spec.rb
 - spec/lib/pact/provider/configuration_spec.rb
 - spec/lib/pact/provider/pact_helper_locator_spec.rb
@@ -400,6 +416,7 @@ files:
 - spec/support/test_app_fail.json
 - spec/support/test_app_pass.json
 - tasks/pact-test.rake
+- tasks/spec.rake
 homepage: https://github.com/uglyog/pact.git
 licenses:
 - MIT
@@ -415,7 +432,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -222789045808917234
+      hash: -1950289785278429589
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -424,7 +441,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -222789045808917234
+      hash: -1950289785278429589
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -449,10 +466,10 @@ test_files:
 - spec/lib/pact/consumer/mock_service_interaction_expectation_spec.rb
 - spec/lib/pact/consumer/request_spec.rb
 - spec/lib/pact/consumer/service_consumer_spec.rb
+- spec/lib/pact/consumer_contract/active_support_support_spec.rb
 - spec/lib/pact/consumer_contract/consumer_contract_spec.rb
 - spec/lib/pact/consumer_contract/interaction_spec.rb
 - spec/lib/pact/consumer_contract/request_spec.rb
-- spec/lib/pact/json_warning_spec.rb
 - spec/lib/pact/matchers/matchers_spec.rb
 - spec/lib/pact/provider/configuration_spec.rb
 - spec/lib/pact/provider/pact_helper_locator_spec.rb