pact 1.0.9 → 1.0.10

data/spec/support/shared_examples_for_request.rb

@@ -0,0 +1,83 @@
+shared_examples "a request" do
+
+  describe 'matching' do
+    let(:expected) do
+      Pact::Request::Expected.from_hash(
+        {'method' => 'get', 'path' => 'path', 'query' => /b/}
+        )
+    end
+
+    let(:actual) do
+      Pact::Consumer::Request::Actual.from_hash({'method' => 'get', 'path' => 'path', 'query' => 'blah', 'headers' => {}, 'body' => ''})
+    end
+
+    it "should match" do
+      expect(expected.difference(actual)).to eq({})
+    end
+  end
+
+  describe 'full_path' do
+    context "with empty path" do
+      subject { described_class.from_hash({:path => '', :method => 'get', :query => '', :headers => {}}) }
+      it "returns the full path"do
+        expect(subject.full_path).to eq "/"
+      end
+    end
+    context "with a path" do
+      subject { described_class.from_hash({:path => '/path', :method => 'get', :query => '', :headers => {}}) }
+      it "returns the full path"do
+        expect(subject.full_path).to eq "/path"
+      end
+    end
+    context "with a path and query" do
+      subject { described_class.from_hash({:path => '/path', :method => 'get', :query => "something", :headers => {}}) }
+      it "returns the full path"do
+        expect(subject.full_path).to eq "/path?something"
+      end
+    end
+    context "with a path and a query that is a Term" do
+      subject { described_class.from_hash({:path => '/path', :method => 'get', :headers => {}, :query => Pact::Term.new(generate: 'a', matcher: /a/)}) }
+      it "returns the full path with reified path" do
+        expect(subject.full_path).to eq "/path?a"
+      end
+    end
+  end
+
+  describe "building from a hash" do
+
+    let(:raw_request) do
+      {
+        'method' => 'get',
+        'path' => '/mallory',
+        'query' => 'query',
+        'headers' => {
+          'Content-Type' => 'application/json'
+        },
+        'body' => 'hello mallory'
+      }
+    end
+
+    subject { described_class.from_hash(raw_request) }
+
+    its(:method) { should == 'get' }
+    its(:path) { should == '/mallory' }
+    its(:body) { should == 'hello mallory' }
+    its(:query) { should eq 'query'}
+
+    it "blows up if method is absent" do
+      raw_request.delete 'method'
+      expect { described_class.from_hash(raw_request) }.to raise_error
+    end
+
+    it "blows up if path is absent" do
+      raw_request.delete 'path'
+      expect { described_class.from_hash(raw_request) }.to raise_error
+    end
+
+    it "does not blow up if body is missing" do
+      raw_request.delete 'body'
+      expect { described_class.from_hash(raw_request) }.to_not raise_error
+    end
+
+  end
+end

data/spec/support/test_app_fail.json

@@ -2,6 +2,9 @@
     "consumer": {
         "name": "an unknown consumer"
     },
+    "provider": {
+        "name": "an unknown provider"
+    },    
     "interactions": [
         {
             "description": "A test request",

data/spec/support/test_app_pass.json

@@ -2,6 +2,9 @@
     "consumer": {
         "name": "some-test-consumer"
     },
+    "provider": {
+        "name": "an unknown provider"
+    },     
     "interactions": [
         {
             "description": "A test request",
@@ -16,6 +19,20 @@
                 "body": {"message" : "sunny"}
             },
             "provider_state": "the weather is sunny"
-        }
+        },
+        {
+            "description": "A test request for text",
+            "request": {
+                "method": "get",
+                "path": "/sometext",
+                "query": "",
+                "body" : "some request text"
+            },
+            "response": {
+                "status": 200,
+                "headers" : {"Content-type": "text/plain"},
+                "body": "some text"
+            }
+        }        
     ]
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -31,22 +31,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.7
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -239,6 +223,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: Define a pact between service consumers and providers
 email:
 - james.fraser@alumni.swinburne.edu
@@ -260,6 +260,11 @@ files:
 - README.md
 - Rakefile
 - bin/pact
+- example/animal-service/Gemfile
+- example/animal-service/Gemfile.lock
+- example/animal-service/Rakefile
+- example/animal-service/spec/service_consumers/pact_helper.rb
+- example/animal-service/spec/service_consumers/provider_states_for_zoo_app.rb
 - example/zoo-app/Gemfile
 - example/zoo-app/Gemfile.lock
 - example/zoo-app/lib/zoo_app/animal_service_client.rb
@@ -273,42 +278,62 @@ files:
 - lib/pact/configuration.rb
 - lib/pact/consumer.rb
 - lib/pact/consumer/app_manager.rb
+- lib/pact/consumer/configuration.rb
 - lib/pact/consumer/consumer_contract_builder.rb
 - lib/pact/consumer/consumer_contract_builders.rb
-- lib/pact/consumer/dsl.rb
 - lib/pact/consumer/interaction_builder.rb
 - lib/pact/consumer/interactions_filter.rb
 - lib/pact/consumer/mock_service.rb
+- lib/pact/consumer/mock_service/app.rb
+- lib/pact/consumer/mock_service/interaction_delete.rb
+- lib/pact/consumer/mock_service/interaction_list.rb
+- lib/pact/consumer/mock_service/interaction_post.rb
+- lib/pact/consumer/mock_service/interaction_replay.rb
+- lib/pact/consumer/mock_service/missing_interactions_get.rb
+- lib/pact/consumer/mock_service/rack_request_helper.rb
+- lib/pact/consumer/mock_service/startup_poll.rb
+- lib/pact/consumer/mock_service/verification_get.rb
 - lib/pact/consumer/mock_service_client.rb
+- lib/pact/consumer/mock_service_interaction_expectation.rb
+- lib/pact/consumer/request.rb
 - lib/pact/consumer/rspec.rb
 - lib/pact/consumer/server.rb
 - lib/pact/consumer_contract.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
 - lib/pact/matchers/matchers.rb
-- lib/pact/pact_task_helper.rb
+- lib/pact/matchers/unexpected_index.rb
+- lib/pact/matchers/unexpected_key.rb
 - lib/pact/provider.rb
 - lib/pact/provider/client_project_pact_helper.rb
-- lib/pact/provider/dsl.rb
+- lib/pact/provider/configuration.rb
 - lib/pact/provider/matchers.rb
 - lib/pact/provider/pact_helper_locator.rb
 - lib/pact/provider/pact_spec_runner.rb
 - lib/pact/provider/pact_verification.rb
 - lib/pact/provider/provider_state.rb
+- lib/pact/provider/request.rb
 - lib/pact/provider/rspec.rb
 - lib/pact/provider/test_methods.rb
 - lib/pact/provider/verification_report.rb
 - lib/pact/reification.rb
-- lib/pact/request.rb
+- lib/pact/shared/dsl.rb
+- lib/pact/shared/key_not_found.rb
+- lib/pact/shared/null_expectation.rb
+- lib/pact/shared/request.rb
 - lib/pact/something_like.rb
+- lib/pact/symbolize_keys.rb
 - lib/pact/tasks.rb
+- lib/pact/tasks/task_helper.rb
+- lib/pact/tasks/verification_task.rb
 - lib/pact/term.rb
-- lib/pact/verification_task.rb
 - lib/pact/version.rb
 - lib/tasks/pact.rake
 - pact.gemspec
@@ -316,27 +341,32 @@ files:
 - spec/features/consumption_spec.rb
 - spec/features/production_spec.rb
 - spec/features/provider_states/zebras.rb
+- spec/integration/consumer_spec.rb
 - spec/integration/pact/consumer_configuration_spec.rb
 - spec/integration/pact/provider_configuration_spec.rb
 - spec/lib/pact/configuration_spec.rb
 - spec/lib/pact/consumer/app_manager_spec.rb
+- spec/lib/pact/consumer/configuration_spec.rb
 - spec/lib/pact/consumer/consumer_contract_builder_spec.rb
-- spec/lib/pact/consumer/dsl_spec.rb
 - spec/lib/pact/consumer/interaction_builder_spec.rb
 - spec/lib/pact/consumer/interactions_spec.rb
-- spec/lib/pact/consumer/mock_service_spec.rb
+- spec/lib/pact/consumer/mock_service/interaction_list_spec.rb
+- spec/lib/pact/consumer/mock_service/rack_request_helper_spec.rb
+- 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/consumer_contract_spec.rb
 - spec/lib/pact/consumer_contract/interaction_spec.rb
+- spec/lib/pact/consumer_contract/request_spec.rb
 - spec/lib/pact/matchers/matchers_spec.rb
-- spec/lib/pact/provider/dsl_spec.rb
+- spec/lib/pact/provider/configuration_spec.rb
 - spec/lib/pact/provider/pact_helper_locator_spec.rb
 - spec/lib/pact/provider/pact_spec_runner_spec.rb
 - spec/lib/pact/provider/provider_state_spec.rb
+- spec/lib/pact/provider/request_spec.rb
 - spec/lib/pact/provider/rspec_spec.rb
 - spec/lib/pact/provider/test_methods_spec.rb
 - spec/lib/pact/reification_spec.rb
-- spec/lib/pact/request_spec.rb
 - spec/lib/pact/term_spec.rb
 - spec/lib/pact/verification_task_spec.rb
 - spec/spec_helper.rb
@@ -345,6 +375,7 @@ files:
 - spec/support/consumer_contract_template.json
 - spec/support/factories.rb
 - spec/support/pact_helper.rb
+- spec/support/shared_examples_for_request.rb
 - spec/support/test_app_fail.json
 - spec/support/test_app_pass.json
 - tasks/pact-test.rake
@@ -377,27 +408,32 @@ test_files:
 - spec/features/consumption_spec.rb
 - spec/features/production_spec.rb
 - spec/features/provider_states/zebras.rb
+- spec/integration/consumer_spec.rb
 - spec/integration/pact/consumer_configuration_spec.rb
 - spec/integration/pact/provider_configuration_spec.rb
 - spec/lib/pact/configuration_spec.rb
 - spec/lib/pact/consumer/app_manager_spec.rb
+- spec/lib/pact/consumer/configuration_spec.rb
 - spec/lib/pact/consumer/consumer_contract_builder_spec.rb
-- spec/lib/pact/consumer/dsl_spec.rb
 - spec/lib/pact/consumer/interaction_builder_spec.rb
 - spec/lib/pact/consumer/interactions_spec.rb
-- spec/lib/pact/consumer/mock_service_spec.rb
+- spec/lib/pact/consumer/mock_service/interaction_list_spec.rb
+- spec/lib/pact/consumer/mock_service/rack_request_helper_spec.rb
+- 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/consumer_contract_spec.rb
 - spec/lib/pact/consumer_contract/interaction_spec.rb
+- spec/lib/pact/consumer_contract/request_spec.rb
 - spec/lib/pact/matchers/matchers_spec.rb
-- spec/lib/pact/provider/dsl_spec.rb
+- spec/lib/pact/provider/configuration_spec.rb
 - spec/lib/pact/provider/pact_helper_locator_spec.rb
 - spec/lib/pact/provider/pact_spec_runner_spec.rb
 - spec/lib/pact/provider/provider_state_spec.rb
+- spec/lib/pact/provider/request_spec.rb
 - spec/lib/pact/provider/rspec_spec.rb
 - spec/lib/pact/provider/test_methods_spec.rb
 - spec/lib/pact/reification_spec.rb
-- spec/lib/pact/request_spec.rb
 - spec/lib/pact/term_spec.rb
 - spec/lib/pact/verification_task_spec.rb
 - spec/spec_helper.rb
@@ -406,5 +442,6 @@ test_files:
 - spec/support/consumer_contract_template.json
 - spec/support/factories.rb
 - spec/support/pact_helper.rb
+- spec/support/shared_examples_for_request.rb
 - spec/support/test_app_fail.json
 - spec/support/test_app_pass.json

data/lib/pact/consumer/dsl.rb

@@ -1,157 +0,0 @@
-require_relative 'consumer_contract_builders'
-
-module Pact::Consumer
-   module DSL
-
-      module Configuration
-        def add_provider_verification &block
-          provider_verifications << block
-        end
-        def provider_verifications
-          @provider_verifications ||= []
-        end
-      end
-
-      def service_consumer name, &block
-        ServiceConsumerDSL.new(name, &block).create_service_consumer
-      end
-
-      class ServiceConsumerDSL
-
-        def initialize name, &block
-          @name = name
-          consumer = Pact::ServiceConsumer.new name: @name
-          @app = nil
-          @port = nil
-          instance_eval(&block)
-        end
-
-        def validate
-          raise "Please provide a consumer name" unless (@name && !@name.empty?)
-          raise "Please provide a port for the consumer app" if @app && !@port
-        end
-
-        def app app
-          @app = app
-        end
-
-        def port port
-          @port = port
-        end
-
-        def has_pact_with service_provider_name, &block
-          Provider.new(service_provider_name, @name, &block).create_consumer_contract_builder
-        end
-
-        def create_service_consumer
-          validate
-          register_consumer_app if @app
-        end
-
-        def register_consumer_app
-          Pact::Consumer::AppManager.instance.register @app, @port
-        end
-      end
-
-
-
-
-      #OLD ####
-      def with_provider name, &block
-         Provider.new(name, &block).create_consumer_contract_builder
-      end
-
-      alias_method :with_service_provider, :with_provider
-
-      class Provider
-         def initialize name, consumer_name = Pact.configuration.consumer.name, &block
-            @name = name
-            @service = nil
-            @consumer_name = consumer_name
-            instance_eval(&block)
-         end
-
-         def service name, &block
-            @service = Service.new(name, &block)
-         end
-
-         alias_method :mock_service, :service
-
-        def create_consumer_contract_builder
-          validate
-          consumer_contract_builder_from_attributes
-        end
-
-        def validate
-          raise "Please configure a service for #{@name}" unless @service
-        end
-
-        def consumer_contract_builder_from_attributes
-          consumer_contract_builder_fields = {
-            :consumer_name => @consumer_name,
-            :provider_name => @name,
-            :pactfile_write_mode => Pact.configuration.pactfile_write_mode
-            }
-          @service.configure_consumer_contract_builder consumer_contract_builder_fields
-        end
-      end
-
-      class Service
-         def initialize name, &block
-            @name = name
-            @port = nil
-            @standalone = false
-            @verify = true
-            instance_eval(&block)
-         end
-
-         def port port
-            @port = port
-         end
-
-         def standalone standalone
-            @standalone = standalone
-         end
-
-         def verify verify
-            @verify = verify
-         end
-
-         def configure_consumer_contract_builder consumer_contract_builder_fields
-            validate
-            unless @standalone
-              AppManager.instance.register_mock_service_for consumer_contract_builder_fields[:provider_name], "http://localhost:#{@port}"
-            end
-            consumer_contract_builder = Pact::Consumer::ConsumerContractBuilder.new consumer_contract_builder_fields.merge({port: @port})
-            create_mock_services_module_method consumer_contract_builder
-            setup_verification(consumer_contract_builder) if @verify
-            consumer_contract_builder
-         end
-
-
-        def setup_verification consumer_contract_builder
-          Pact.configuration.add_provider_verification do | example_description |
-            consumer_contract_builder.verify example_description
-          end
-        end
-
-         private
-
-         # This makes the consumer_contract_builder available via a module method with the given identifier
-         # as the method name.
-         # I feel this should be defined somewhere else, but I'm not sure where
-         def create_mock_services_module_method consumer_contract_builder
-           Pact::Consumer::ConsumerContractBuilders.send(:define_method, @name.to_sym) do
-             consumer_contract_builder
-           end
-         end
-
-         def validate
-            raise "Please provide a port for service #{@name}" unless @port
-         end
-      end
-   end
-end
-
-Pact.send(:extend, Pact::Consumer::DSL)
-Pact::Configuration.send(:include, Pact::Consumer::DSL::Configuration)