pact 1.3.3 → 1.4.0.rc2

data/lib/pact/version.rb

@@ -1,3 +1,3 @@
 module Pact
-  VERSION = "1.3.3"
+  VERSION = "1.4.0.rc2"
 end

data/pact.gemspec

@@ -28,6 +28,11 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'webrick'
   gem.add_runtime_dependency 'term-ansicolor', '~> 1.0'
 
+  unless ENV['X_PACT_DEVELOPMENT']
+    gem.add_runtime_dependency 'pact-support', '~> 0.0.2'
+    gem.add_runtime_dependency 'pact-mock_service', '~> 0.0.1'
+  end
+
   gem.add_development_dependency 'rake', '~> 10.0.3'
   gem.add_development_dependency 'webmock', '~> 1.18.0'
   gem.add_development_dependency 'pry'

data/spec/lib/pact/consumer/interaction_builder_spec.rb

@@ -5,7 +5,7 @@ module Pact
   module Consumer
     describe InteractionBuilder do
 
-      subject { InteractionBuilder.new }
+      subject { InteractionBuilder.new {|interaction|} }
       let(:interaction) { double('Interaction').as_null_object}
 
       before do
@@ -57,7 +57,7 @@ module Pact
         it "returns itself" do
           expect(subject.given(nil)).to be(subject)
         end
-      end 
+      end
 
       describe "will_respond_with" do
         let(:response) { {a: 'response'} }
@@ -66,11 +66,7 @@ module Pact
           double(callback: nil)
         end
 
-        before do
-          subject.on_interaction_fully_defined do | interaction |
-            provider.callback interaction
-          end
-        end
+        subject { InteractionBuilder.new {|interaction| provider.callback interaction } }
 
         it "sets the response on the interaction" do
           expect(interaction).to receive(:response=).with(response)
@@ -84,7 +80,7 @@ module Pact
         it "invokes the 'on_interaction_fully_defined' callback" do
           expect(provider).to receive(:callback).with(interaction)
           subject.will_respond_with response
-        end          
+        end
       end
     end
   end

data/spec/support/case-insensitive-response-header-matching.json

@@ -0,0 +1,21 @@
+{
+    "consumer": {
+        "name": "an easy consumer"
+    },
+    "provider": {
+        "name": "a provider which returns headers that don't match the expected case"
+    },
+    "interactions": [
+        {
+            "description": "a test request",
+            "request": {
+                "method": "get",
+                "path": "/"
+            },
+            "response": {
+                "status": 200,
+                "headers": {"Content-Type": "application/hippo"}
+            }
+        }
+    ]
+}

data/spec/support/case-insensitive-response-header-matching.rb

@@ -0,0 +1,15 @@
+module Pact
+  module Test
+    class CaseInsensitiveResponseHeadersApp
+
+      def call env
+        [200, {'cOnTent-tYpe' => 'application/hippo'},[]]
+      end
+
+    end
+  end
+end
+
+Pact.service_provider "Provider" do
+  app { Pact::Test::CaseInsensitiveResponseHeadersApp.new }
+end

data/tasks/pact-test.rake

@@ -22,6 +22,10 @@ Pact::VerificationTask.new(:term) do | pact |
 	pact.uri './spec/support/term.json'
 end
 
+Pact::VerificationTask.new(:case_insensitive_response_header_matching) do | pact |
+	pact.uri './spec/support/case-insensitive-response-header-matching.json', :pact_helper => './spec/support/case-insensitive-response-header-matching.rb'
+end
+
 RSpec::Core::RakeTask.new('spec:standalone:fail') do | task |
 	task.pattern = FileList["spec/standalone/**/*_fail_test.rb"]
 end
@@ -55,6 +59,7 @@ namespace :pact do
 		Rake::Task['pact:test:fail'].execute
 		Rake::Task['pact:test:pactfile'].execute
 		Rake::Task['pact:verify:test_app:content_type'].execute
+		Rake::Task['pact:verify:case_insensitive_response_header_matching'].execute
 	end
 
 	desc "All the verification tests with active support loaded"

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.3.3
-  prerelease: 
+  version: 1.4.0.rc2
+  prerelease: 6
 platform: ruby
 authors:
 - James Fraser
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -159,6 +159,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: pact-support
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: pact-mock_service
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -325,9 +357,7 @@ files:
 - example/zoo-app/spec/spec_helper.rb
 - lib/pact.rb
 - lib/pact/cli.rb
-- lib/pact/configuration.rb
 - lib/pact/consumer.rb
-- lib/pact/consumer/app_manager.rb
 - lib/pact/consumer/configuration.rb
 - lib/pact/consumer/configuration/configuration_extensions.rb
 - lib/pact/consumer/configuration/dsl.rb
@@ -337,37 +367,9 @@ files:
 - lib/pact/consumer/consumer_contract_builder.rb
 - lib/pact/consumer/consumer_contract_builders.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_mismatch.rb
-- lib/pact/consumer/mock_service/interaction_post.rb
-- lib/pact/consumer/mock_service/interaction_replay.rb
-- lib/pact/consumer/mock_service/log_get.rb
-- lib/pact/consumer/mock_service/missing_interactions_get.rb
-- lib/pact/consumer/mock_service/mock_service_administration_endpoint.rb
-- lib/pact/consumer/mock_service/pact_post.rb
-- lib/pact/consumer/mock_service/rack_request_helper.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/spec_hooks.rb
 - lib/pact/consumer/world.rb
-- lib/pact/consumer_contract.rb
-- lib/pact/consumer_contract/consumer_contract.rb
-- lib/pact/consumer_contract/consumer_contract_writer.rb
-- lib/pact/consumer_contract/file_name.rb
-- lib/pact/consumer_contract/headers.rb
-- lib/pact/consumer_contract/interaction.rb
-- lib/pact/consumer_contract/pact_file.rb
-- lib/pact/consumer_contract/request.rb
-- lib/pact/consumer_contract/service_consumer.rb
-- lib/pact/consumer_contract/service_provider.rb
 - lib/pact/doc/doc_file.rb
 - lib/pact/doc/generate.rb
 - lib/pact/doc/generator.rb
@@ -378,24 +380,6 @@ files:
 - lib/pact/doc/markdown/interaction.erb
 - lib/pact/doc/markdown/interaction_renderer.rb
 - lib/pact/doc/sort_interactions.rb
-- lib/pact/logging.rb
-- lib/pact/matchers.rb
-- lib/pact/matchers/actual_type.rb
-- lib/pact/matchers/base_difference.rb
-- lib/pact/matchers/differ.rb
-- lib/pact/matchers/difference.rb
-- lib/pact/matchers/difference_indicator.rb
-- lib/pact/matchers/embedded_diff_formatter.rb
-- lib/pact/matchers/expected_type.rb
-- lib/pact/matchers/index_not_found.rb
-- lib/pact/matchers/list_diff_formatter.rb
-- lib/pact/matchers/matchers.rb
-- lib/pact/matchers/no_diff_indicator.rb
-- lib/pact/matchers/regexp_difference.rb
-- lib/pact/matchers/type_difference.rb
-- lib/pact/matchers/unexpected_index.rb
-- lib/pact/matchers/unexpected_key.rb
-- lib/pact/matchers/unix_diff_formatter.rb
 - lib/pact/project_root.rb
 - lib/pact/provider.rb
 - lib/pact/provider/configuration.rb
@@ -424,23 +408,10 @@ files:
 - lib/pact/provider/test_methods.rb
 - lib/pact/provider/verification_report.rb
 - lib/pact/provider/world.rb
-- lib/pact/reification.rb
-- lib/pact/rspec.rb
-- lib/pact/shared/active_support_support.rb
-- lib/pact/shared/dsl.rb
-- lib/pact/shared/jruby_support.rb
-- lib/pact/shared/json_differ.rb
-- lib/pact/shared/key_not_found.rb
-- lib/pact/shared/null_expectation.rb
-- lib/pact/shared/request.rb
-- lib/pact/shared/text_differ.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/templates/provider_state.erb
-- lib/pact/term.rb
 - lib/pact/version.rb
 - lib/tasks/pact.rake
 - pact.gemspec
@@ -466,29 +437,12 @@ files:
 - spec/lib/pact/consumer/mock_service/verification_get_spec.rb
 - spec/lib/pact/consumer/mock_service_client_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/active_support_support_spec.rb
-- spec/lib/pact/consumer_contract/consumer_contract_spec.rb
 - spec/lib/pact/consumer_contract/consumer_contract_writer_spec.rb
-- spec/lib/pact/consumer_contract/headers_spec.rb
-- spec/lib/pact/consumer_contract/interaction_spec.rb
-- spec/lib/pact/consumer_contract/request_spec.rb
 - spec/lib/pact/doc/generator_spec.rb
 - spec/lib/pact/doc/interaction_view_model_spec.rb
 - spec/lib/pact/doc/markdown/consumer_contract_renderer_spec.rb
 - spec/lib/pact/doc/markdown/index_renderer_spec.rb
-- spec/lib/pact/matchers/differ_spec.rb
-- spec/lib/pact/matchers/difference_spec.rb
-- spec/lib/pact/matchers/embedded_diff_formatter_spec.rb
-- spec/lib/pact/matchers/index_not_found_spec.rb
-- spec/lib/pact/matchers/list_diff_formatter_spec.rb
-- spec/lib/pact/matchers/matchers_spec.rb
-- spec/lib/pact/matchers/regexp_difference_spec.rb
-- spec/lib/pact/matchers/type_difference_spec.rb
-- spec/lib/pact/matchers/unexpected_index_spec.rb
-- spec/lib/pact/matchers/unexpected_key_spec.rb
-- spec/lib/pact/matchers/unix_diff_formatter_spec.rb
 - spec/lib/pact/provider/configuration/configuration_extension_spec.rb
 - spec/lib/pact/provider/configuration/pact_verification_spec.rb
 - spec/lib/pact/provider/configuration/service_provider_config_spec.rb
@@ -505,16 +459,8 @@ files:
 - spec/lib/pact/provider/state/provider_state_proxy_spec.rb
 - spec/lib/pact/provider/state/provider_state_spec.rb
 - spec/lib/pact/provider/world_spec.rb
-- spec/lib/pact/reification_spec.rb
-- spec/lib/pact/shared/dsl_spec.rb
-- spec/lib/pact/shared/json_differ_spec.rb
-- spec/lib/pact/shared/key_not_found_spec.rb
-- spec/lib/pact/shared/request_spec.rb
-- spec/lib/pact/shared/text_differ_spec.rb
-- spec/lib/pact/something_like_spec.rb
 - spec/lib/pact/tasks/task_helper_spec.rb
 - spec/lib/pact/tasks/verification_task_spec.rb
-- spec/lib/pact/term_spec.rb
 - spec/pact_specification/compliance-1.0.0.rb
 - spec/spec_helper.rb
 - spec/standalone/consumer_fail_test.rb
@@ -523,8 +469,9 @@ files:
 - spec/support/a_consumer-a_provider.json
 - spec/support/active_support_if_configured.rb
 - spec/support/app_for_config_ru.rb
+- spec/support/case-insensitive-response-header-matching.json
+- spec/support/case-insensitive-response-header-matching.rb
 - spec/support/consumer_contract_template.json
-- spec/support/dsl_spec_support.rb
 - spec/support/factories.rb
 - spec/support/generated_index.md
 - spec/support/generated_markdown.md
@@ -560,16 +507,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3250914731854232740
+      hash: 2508150550724999576
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 3250914731854232740
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -600,29 +544,12 @@ test_files:
 - spec/lib/pact/consumer/mock_service/verification_get_spec.rb
 - spec/lib/pact/consumer/mock_service_client_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/active_support_support_spec.rb
-- spec/lib/pact/consumer_contract/consumer_contract_spec.rb
 - spec/lib/pact/consumer_contract/consumer_contract_writer_spec.rb
-- spec/lib/pact/consumer_contract/headers_spec.rb
-- spec/lib/pact/consumer_contract/interaction_spec.rb
-- spec/lib/pact/consumer_contract/request_spec.rb
 - spec/lib/pact/doc/generator_spec.rb
 - spec/lib/pact/doc/interaction_view_model_spec.rb
 - spec/lib/pact/doc/markdown/consumer_contract_renderer_spec.rb
 - spec/lib/pact/doc/markdown/index_renderer_spec.rb
-- spec/lib/pact/matchers/differ_spec.rb
-- spec/lib/pact/matchers/difference_spec.rb
-- spec/lib/pact/matchers/embedded_diff_formatter_spec.rb
-- spec/lib/pact/matchers/index_not_found_spec.rb
-- spec/lib/pact/matchers/list_diff_formatter_spec.rb
-- spec/lib/pact/matchers/matchers_spec.rb
-- spec/lib/pact/matchers/regexp_difference_spec.rb
-- spec/lib/pact/matchers/type_difference_spec.rb
-- spec/lib/pact/matchers/unexpected_index_spec.rb
-- spec/lib/pact/matchers/unexpected_key_spec.rb
-- spec/lib/pact/matchers/unix_diff_formatter_spec.rb
 - spec/lib/pact/provider/configuration/configuration_extension_spec.rb
 - spec/lib/pact/provider/configuration/pact_verification_spec.rb
 - spec/lib/pact/provider/configuration/service_provider_config_spec.rb
@@ -639,16 +566,8 @@ test_files:
 - spec/lib/pact/provider/state/provider_state_proxy_spec.rb
 - spec/lib/pact/provider/state/provider_state_spec.rb
 - spec/lib/pact/provider/world_spec.rb
-- spec/lib/pact/reification_spec.rb
-- spec/lib/pact/shared/dsl_spec.rb
-- spec/lib/pact/shared/json_differ_spec.rb
-- spec/lib/pact/shared/key_not_found_spec.rb
-- spec/lib/pact/shared/request_spec.rb
-- spec/lib/pact/shared/text_differ_spec.rb
-- spec/lib/pact/something_like_spec.rb
 - spec/lib/pact/tasks/task_helper_spec.rb
 - spec/lib/pact/tasks/verification_task_spec.rb
-- spec/lib/pact/term_spec.rb
 - spec/pact_specification/compliance-1.0.0.rb
 - spec/spec_helper.rb
 - spec/standalone/consumer_fail_test.rb
@@ -657,8 +576,9 @@ test_files:
 - spec/support/a_consumer-a_provider.json
 - spec/support/active_support_if_configured.rb
 - spec/support/app_for_config_ru.rb
+- spec/support/case-insensitive-response-header-matching.json
+- spec/support/case-insensitive-response-header-matching.rb
 - spec/support/consumer_contract_template.json
-- spec/support/dsl_spec_support.rb
 - spec/support/factories.rb
 - spec/support/generated_index.md
 - spec/support/generated_markdown.md

data/lib/pact/configuration.rb

@@ -1,195 +0,0 @@
-require 'ostruct'
-require 'logger'
-require 'pact/doc/markdown/generator'
-require 'pact/matchers/unix_diff_formatter'
-require 'pact/matchers/embedded_diff_formatter'
-require 'pact/matchers/list_diff_formatter'
-require 'pact/shared/json_differ'
-require 'pact/shared/text_differ'
-
-module Pact
-
-  class Configuration
-
-    DOC_GENERATORS = { markdown: Pact::Doc::Markdown::Generator }
-
-    DIFF_FORMATTERS = {
-      :embedded => Pact::Matchers::EmbeddedDiffFormatter,
-      :unix => Pact::Matchers::UnixDiffFormatter,
-      :list => Pact::Matchers::ListDiffFormatter
-    }
-
-
-    class NilMatcher
-      def self.=~ other
-        other == nil ? 0 : nil
-      end
-    end
-
-    DIFF_FORMATTER_REGISTRATIONS = [
-      [/.*/, Pact::Matchers::UnixDiffFormatter],
-      [NilMatcher, Pact::Matchers::UnixDiffFormatter]
-    ]
-
-    DIFFERS = [
-      [/json/, Pact::JsonDiffer],
-      [NilMatcher, Pact::TextDiffer],
-      [/.*/, Pact::TextDiffer]
-    ]
-
-
-    DEFAULT_DIFFER = Pact::TextDiffer
-
-    attr_accessor :pact_dir
-    attr_accessor :log_dir
-    attr_accessor :doc_dir
-    attr_accessor :reports_dir
-    attr_writer :logger
-    attr_accessor :tmp_dir
-    attr_writer :pactfile_write_mode
-
-    attr_accessor :error_stream
-    attr_accessor :output_stream
-
-    def self.default_configuration
-      c = Configuration.new
-      c.pact_dir = File.expand_path('./spec/pacts')
-      c.tmp_dir = File.expand_path('./tmp/pacts')
-      c.log_dir = default_log_dir
-      c.pactfile_write_mode = :overwrite
-      c.reports_dir = File.expand_path('./reports/pacts')
-      c.doc_dir = File.expand_path("./doc/pacts")
-      c.output_stream = $stdout
-      c.error_stream = $stderr
-      c
-    end
-
-    def initialize
-      @differ_registrations = []
-      @diff_formatter_registrations = []
-    end
-
-    def logger
-      @logger ||= create_logger
-    end
-
-    def doc_generator= doc_generator
-      doc_generators << begin
-        if DOC_GENERATORS[doc_generator]
-          DOC_GENERATORS[doc_generator]
-        elsif doc_generator.respond_to?(:call)
-          doc_generator
-        else
-          raise "Pact.configuration.doc_generator needs to respond to call, or be in the preconfigured list: #{DOC_GENERATORS.keys}"
-        end
-      end
-    end
-
-    def doc_generators
-      @doc_generators  ||= []
-    end
-
-    # Should this be deprecated in favour of register_diff_formatter???
-    def diff_formatter= diff_formatter
-      register_diff_formatter /.*/, diff_formatter
-      register_diff_formatter nil, diff_formatter
-    end
-
-    def register_diff_formatter content_type, diff_formatter
-      key = content_type_regexp_for content_type
-      @diff_formatter_registrations << [key, diff_formatter_for(diff_formatter)]
-    end
-
-    def diff_formatter_for_content_type content_type
-      diff_formatter_registrations.find{ | registration | registration.first =~ content_type }.last
-    end
-
-    def register_body_differ content_type, differ
-      key = content_type_regexp_for content_type
-      validate_differ differ
-      @differ_registrations << [key, differ]
-    end
-
-    def body_differ_for_content_type content_type
-      differ_registrations.find{ | registration | registration.first =~ content_type }.last
-    end
-
-    def log_path
-      log_dir + "/pact.log"
-    end
-
-    def pactfile_write_mode
-      if @pactfile_write_mode == :smart
-        is_rake_running? ? :overwrite : :update
-      else
-        @pactfile_write_mode
-      end
-    end
-
-    private
-
-    def diff_formatter_for input
-      if DIFF_FORMATTERS[input]
-        DIFF_FORMATTERS[input]
-      elsif input.respond_to?(:call)
-        input
-      else
-        raise "Pact diff_formatter needs to respond to call, or be in the preconfigured list: #{DIFF_FORMATTERS.keys}"
-      end
-    end
-
-    def validate_differ differ
-      if !differ.respond_to?(:call)
-        raise "Pact.configuration.register_body_differ expects a differ that is a lamda or a class/object that responds to call."
-      end
-    end
-
-    def content_type_regexp_for content_type
-      case content_type
-      when String then Regexp.new(/^#{Regexp.escape(content_type)}$/)
-      when Regexp then content_type
-      when nil then NilMatcher
-      else
-        raise "Invalid content type used to register a differ (#{content_type.inspect}). Please use a Regexp or a String."
-      end
-    end
-
-    def differ_registrations
-      @differ_registrations + DIFFERS
-    end
-
-    def diff_formatter_registrations
-      @diff_formatter_registrations + DIFF_FORMATTER_REGISTRATIONS
-    end
-
-    def self.default_log_dir
-      File.expand_path("./log")
-    end
-
-    #Would love a better way of determining this! It sure won't work on windows.
-    def is_rake_running?
-      `ps -ef | grep rake | grep #{Process.ppid} | grep -v 'grep'`.size > 0
-    end
-
-    def create_logger
-      FileUtils::mkdir_p log_dir
-      logger = Logger.new(log_path)
-      logger.level = Logger::DEBUG
-      logger
-    end
-  end
-
-  def self.configuration
-    @configuration ||= Configuration.default_configuration
-  end
-
-  def self.configure
-    yield configuration
-    FileUtils::mkdir_p configuration.tmp_dir
-  end
-
-  def self.clear_configuration
-    @configuration = nil
-  end
-
-end