pact 1.0.30 → 1.0.31

data/lib/pact/consumer/configuration.rb

@@ -44,7 +44,7 @@ module Pact::Consumer
         def has_pact_with service_provider_name, &block
           ServiceProvider.build(service_provider_name, name, &block)
         end
-      end   
+      end
 
       def finalize
         validate
@@ -76,7 +76,7 @@ module Pact::Consumer
         @consumer_name = consumer_name
       end
 
-      dsl do          
+      dsl do
         def mock_service name, &block
           self.service = MockService.build(name, consumer_name, self.name, &block)
         end

data/lib/pact/consumer/consumer_contract_builder.rb

@@ -11,7 +11,7 @@ module Pact
 
       include Pact::Logging
 
-      attr_reader :consumer_contract
+      attr_reader :consumer_contract, :mock_service_base_url
 
       def initialize(attributes)
         @interaction_builder = nil
@@ -22,6 +22,7 @@ module Pact
           )
         @consumer_contract.interactions = interactions_for_new_consumer_contract(attributes[:pactfile_write_mode])
         @interactions_filter = filter(@consumer_contract.interactions, attributes[:pactfile_write_mode])
+        @mock_service_base_url = "http://localhost:#{attributes[:port]}"
       end
 
       def given(provider_state)

data/lib/pact/consumer/interactions_filter.rb

@@ -1,3 +1,10 @@
+#
+# When running in pactfile_write_mode :overwrite, all interactions are cleared from the
+# pact file, and all new interactions should be distinct (unique description and provider state).
+# When running in pactfile_write_mode :update, an interaction with the same description
+# and provider state as an existing one will just overwrite that one interaction.
+#
+
 module Pact
    module Consumer
 

data/lib/pact/consumer/mock_service/app.rb

@@ -39,7 +39,7 @@ module Pact
       end
 
       def configure_logger options
-        options = {log_file: STDOUT}.merge options
+        options = {log_file: $stdout}.merge options
         log_stream = options[:log_file]
         @logger = Logger.new log_stream
         @logger.level = Pact.configuration.logger.level
@@ -60,10 +60,15 @@ module Pact
         begin
           relevant_handler = @handlers.detect { |handler| handler.match? env }
           response = relevant_handler.respond env
-        rescue Exception => e
+        rescue StandardError => e
           @logger.error 'Error ocurred in mock service:'
           @logger.ap e, :error
           @logger.ap e.backtrace
+          response = [500, {'Content-Type' => 'application/json'}, [{message: e.message, backtrace: e.backtrace}.to_json]]
+        rescue Exception => e
+          @logger.error 'Exception ocurred in mock service:'
+          @logger.ap e, :error
+          @logger.ap e.backtrace
           raise e
         end
         response

data/lib/pact/consumer/mock_service/interaction_mismatch.rb

@@ -2,6 +2,11 @@ require 'pact/matchers/diff_decorator'
 
 module Pact
   module Consumer
+
+    # Presents the differences between an actual request, and a list of
+    # expected interactions where the methods and paths match the actual request.
+    # This is used to display a helpful message to the user when a request
+    # comes in that doesn't match any of the expected interactions.
     class InteractionMismatch
 
       attr_accessor :candidate_interactions, :actual_request
@@ -24,7 +29,7 @@ module Pact
 
       def short_summary
         mismatched_attributes = candiate_diffs.collect(&:mismatched_attributes).flatten.uniq.join(", ").reverse.sub(",", "dna ").reverse #OMG what a hack!
-        actual_request.method_and_path + " (#{mismatched_attributes} did not match)"
+        actual_request.method_and_path + " (request #{mismatched_attributes} did not match)"
       end
 
       private

data/lib/pact/consumer/mock_service/interaction_post.rb

@@ -24,7 +24,7 @@ module Pact
         interaction_list.add interaction
         logger.info "Registered expected interaction #{interaction.request.method_and_path} for #{name}"
         logger.ap interaction.as_json
-        [200, {}, ['Added interactions']]
+        [200, {}, ['Added interaction']]
       end
     end
   end

data/lib/pact/consumer/mock_service/rack_request_helper.rb

@@ -4,7 +4,7 @@ module Pact
     module RackRequestHelper
       REQUEST_KEYS = {
         'REQUEST_METHOD' => :method,
-        'REQUEST_PATH' => :path,
+        'PATH_INFO' => :path,
         'QUERY_STRING' => :query,
         'rack.input' => :body
       }

data/lib/pact/consumer/rspec.rb

@@ -1,4 +1,6 @@
 require 'pact/consumer'
+require 'pact/consumer/spec_hooks'
+require 'pact/consumer/rspec/full_example_description'
 
 module Pact
   module Consumer
@@ -8,33 +10,25 @@ module Pact
   end
 end
 
+hooks = Pact::Consumer::SpecHooks.new
+
+
 RSpec.configure do |config|
   config.include Pact::Consumer::RSpec, :pact => true
 
   config.before :all, :pact => true do
-    Pact::Consumer::AppManager.instance.spawn_all
-    FileUtils.mkdir_p Pact.configuration.pact_dir
+    hooks.before_all
   end
 
   config.before :each, :pact => true do | example |
-    example_description = "#{example.example.example_group.description} #{example.example.description}"
-    Pact.configuration.logger.info "Clearing all expectations"
-    Pact::Consumer::AppManager.instance.ports_of_mock_services.each do | port |
-      Pact::Consumer::MockServiceClient.clear_interactions port, example_description
-    end
+    hooks.before_each Pact::Consumer::RSpec::FullExampleDescription.new(example).to_s
   end
 
   config.after :each, :pact => true do | example |
-    example_description = "#{example.example.example_group.description} #{example.example.description}"
-    Pact.configuration.logger.info "Verifying interactions for #{example_description}"
-    Pact.configuration.provider_verifications.each do | provider_verification |
-      provider_verification.call example_description
-    end
+    hooks.after_each Pact::Consumer::RSpec::FullExampleDescription.new(example).to_s
   end
 
   config.after :suite do
-    Pact.configuration.logger.info "After suite"
-    Pact::Consumer::AppManager.instance.kill_all
-    Pact::Consumer::AppManager.instance.clear_all
+    hooks.after_suite
   end
 end

data/lib/pact/consumer/rspec/full_example_description.rb

@@ -0,0 +1,28 @@
+#
+# Creates the full description for an example group
+#
+module Pact
+  module Consumer
+    module RSpec
+      class FullExampleDescription
+
+        def initialize example
+          @example = example
+        end
+
+        def parent_group_descriptions
+          @example.example.example_group.parent_groups.collect(&:description).reverse
+        end
+
+        def example_description
+          @example.example.description
+        end
+
+        def to_s
+          (parent_group_descriptions + [example_description]).join(" ")
+        end
+
+      end
+    end
+  end
+end

data/lib/pact/consumer/spec_hooks.rb

@@ -0,0 +1,31 @@
+module Pact
+  module Consumer
+    class SpecHooks
+
+      def before_all
+        Pact::Consumer::AppManager.instance.spawn_all
+        FileUtils.mkdir_p Pact.configuration.pact_dir
+      end
+
+      def before_each example_description
+        Pact.configuration.logger.info "Clearing all expectations"
+        Pact::Consumer::AppManager.instance.ports_of_mock_services.each do | port |
+          Pact::Consumer::MockServiceClient.clear_interactions port, example_description
+        end
+      end
+
+      def after_each example_description
+        Pact.configuration.logger.info "Verifying interactions for #{example_description}"
+        Pact.configuration.provider_verifications.each do | provider_verification |
+          provider_verification.call example_description
+        end
+      end
+
+      def after_suite
+        Pact.configuration.logger.info "After suite"
+        Pact::Consumer::AppManager.instance.kill_all
+        Pact::Consumer::AppManager.instance.clear_all
+      end
+    end
+  end
+end

data/lib/pact/consumer_contract/consumer_contract.rb

@@ -11,42 +11,13 @@ require_relative 'service_provider'
 require_relative 'interaction'
 require_relative 'request'
 require_relative 'active_support_support'
+require_relative 'pact_file'
+require_relative 'file_name'
 
 
 
 module Pact
 
-  module PactFile
-    extend self
-    def read uri, options = {}
-      pact = open(uri) { | file | file.read }
-      if options[:save_pactfile_to_tmp]
-        save_pactfile_to_tmp pact, ::File.basename(uri)
-      end
-      pact
-    rescue StandardError => e
-      $stderr.puts "Error reading file from #{uri}"
-      $stderr.puts "#{e.to_s} #{e.backtrace.join("\n")}"
-      raise e
-    end
-
-    def save_pactfile_to_tmp pact, name
-      ::FileUtils.mkdir_p Pact.configuration.tmp_dir
-      ::File.open(Pact.configuration.tmp_dir + "/#{name}", "w") { |file|  file << pact}
-    end
-  end
-
-  #TODO move to external file for reuse
-  module FileName
-    def file_name consumer_name, provider_name
-      "#{filenamify(consumer_name)}-#{filenamify(provider_name)}.json"
-    end
-
-    def filenamify name
-      name.downcase.gsub(/\s/, '_')
-    end
-  end
-
   class ConsumerContract
 
     include SymbolizeKeys

data/lib/pact/consumer_contract/file_name.rb

@@ -0,0 +1,13 @@
+module Pact
+
+  #TODO move to external file for reuse
+  module FileName
+    def file_name consumer_name, provider_name
+      "#{filenamify(consumer_name)}-#{filenamify(provider_name)}.json"
+    end
+
+    def filenamify name
+      name.downcase.gsub(/\s/, '_')
+    end
+  end
+end

data/lib/pact/consumer_contract/pact_file.rb

@@ -0,0 +1,24 @@
+module Pact
+
+  module PactFile
+
+    extend self
+
+    def read uri, options = {}
+      pact = open(uri) { | file | file.read }
+      if options[:save_pactfile_to_tmp]
+        save_pactfile_to_tmp pact, ::File.basename(uri)
+      end
+      pact
+    rescue StandardError => e
+      $stderr.puts "Error reading file from #{uri}"
+      $stderr.puts "#{e.to_s} #{e.backtrace.join("\n")}"
+      raise e
+    end
+
+    def save_pactfile_to_tmp pact, name
+      ::FileUtils.mkdir_p Pact.configuration.tmp_dir
+      ::File.open(Pact.configuration.tmp_dir + "/#{name}", "w") { |file|  file << pact}
+    end
+  end
+end

data/lib/pact/provider/matchers.rb

@@ -1,4 +1,5 @@
 require 'pact/term'
+require 'pact/consumer_contract/active_support_support'
 require 'awesome_print'
 require 'pact/matchers'
 require 'awesome_print'
@@ -6,6 +7,7 @@ require 'rspec'
 
 RSpec::Matchers.define :match_term do |expected|
   include Pact::Matchers
+  include Pact::ActiveSupportSupport
 
   match do |actual|
     if (difference = diff(expected, actual)).any?
@@ -17,7 +19,7 @@ RSpec::Matchers.define :match_term do |expected|
   end
 
   failure_message_for_should do | actual |
-    @message.ai
+    fix_json_formatting @message.to_json
   end
 
 end

data/lib/pact/provider/provider_state.rb

@@ -1,3 +1,5 @@
+require 'pact/shared/dsl'
+
 module Pact
   module Provider
 
@@ -15,7 +17,7 @@ module Pact
 
     class ProviderStates
       def self.provider_state name, &block
-        ProviderState.new(name, current_namespaces.join('.'), &block)
+        ProviderState.build(name, current_namespaces.join('.'), &block)
       end
 
       def self.register name, provider_state
@@ -41,10 +43,7 @@ module Pact
       attr_accessor :name
       attr_accessor :namespace
 
-
-      def register
-        ProviderStates.register(namespaced(name), self)
-      end
+      extend Pact::DSL
 
       def initialize name, namespace, &block
         @name = name
@@ -52,32 +51,56 @@ module Pact
         @set_up_defined = false
         @tear_down_defined = false
         @no_op_defined = false
-        instance_eval(&block)
+      end
+
+      dsl do
+        def set_up &block
+          self.register_set_up &block
+        end
+
+        def tear_down &block
+          self.register_tear_down &block
+        end
+
+        def no_op
+          self.register_no_op
+        end
+      end
+
+      def register
+        ProviderStates.register(namespaced(name), self)
+      end
+
+      def finalize
         validate
       end
 
-      def set_up &block
-        if block_given?
-          @set_up_block = block
-          @set_up_defined = true
-        elsif @set_up_block
+      def register_set_up &block
+        @set_up_block = block
+        @set_up_defined = true
+      end
+
+      def register_tear_down &block
+        @tear_down_block = block
+        @tear_down_defined = true
+      end
+
+      def register_no_op
+        @no_op_defined = true
+      end
+
+      def set_up
+        if @set_up_block
           instance_eval &@set_up_block
         end
       end
 
-      def tear_down &block
-        if block_given?
-          @tear_down_block = block
-          @tear_down_defined = true
-        elsif @tear_down_block
+      def tear_down
+        if @tear_down_block
           instance_eval &@tear_down_block
         end
       end
 
-      def no_op
-        @no_op_defined = true
-      end
-
       private
 
       attr_accessor :no_op_defined, :set_up_defined, :tear_down_defined

data/lib/pact/version.rb

@@ -1,3 +1,3 @@
 module Pact
-  VERSION = "1.0.30"
+  VERSION = "1.0.31"
 end

data/pact.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
 
   gem.add_runtime_dependency 'randexp', '~> 0.1.7'
-  gem.add_runtime_dependency 'thin'
   gem.add_runtime_dependency 'rspec', '~> 2.12'
   gem.add_runtime_dependency 'find_a_port', '~> 1.0.1'
   gem.add_runtime_dependency 'rack-test', '~> 0.6.2'