pact 1.1.0.rc2 → 1.1.0.rc3

data/lib/pact/consumer/configuration.rb

@@ -1,179 +1,11 @@
 require 'pact/configuration'
 require 'pact/consumer/consumer_contract_builders'
 require 'pact/consumer/consumer_contract_builder'
-require 'pact/shared/dsl'
+require 'pact/consumer/configuration/service_consumer'
+require 'pact/consumer/configuration/service_provider'
+require 'pact/consumer/configuration/dsl'
+require 'pact/consumer/configuration/configuration_extensions'
 
-module Pact::Consumer
-
-  module DSL
-    def service_consumer name, &block
-      Configuration::ServiceConsumer.build(name, &block)
-    end
-  end
-
-  module Configuration
-
-    module ConfigurationExtensions
-      def add_provider_verification &block
-        provider_verifications << block
-      end
-      def provider_verifications
-        @provider_verifications ||= []
-      end
-    end
-
-    class ServiceConsumer
-      extend Pact::DSL
-      attr_accessor :app, :port, :name
-
-      def initialize name
-        @name = name
-        @app = nil
-        @port = nil
-      end
-
-      dsl do
-        def app app
-          self.app = app
-        end
-
-        def port port
-          self.port = port
-        end
-
-        def has_pact_with service_provider_name, &block
-          ServiceProvider.build(service_provider_name, name, &block)
-        end
-      end
-
-      def finalize
-        validate
-        register_consumer_app if @app
-      end
-
-      private
-
-      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 register_consumer_app
-        Pact::Consumer::AppManager.instance.register app, port
-      end
-    end
-
-
-    class ServiceProvider
-      extend Pact::DSL
-
-      attr_accessor :service, :consumer_name, :name
-
-      def initialize name, consumer_name
-        @name = name
-        @service = nil
-        @consumer_name = consumer_name
-      end
-
-      dsl do
-        def mock_service name, &block
-          self.service = MockService.build(name, consumer_name, self.name, &block)
-        end
-      end
-
-      def finalize
-        validate
-      end
-
-      private
-
-      def validate
-        raise "Please configure a service for #{name}" unless service
-      end
-
-    end
-
-    class MockService
-      extend Pact::DSL
-
-      attr_accessor :port, :standalone, :verify, :provider_name, :consumer_name
-
-      def initialize name, consumer_name, provider_name
-        @name = name
-        @consumer_name = consumer_name
-        @provider_name = provider_name
-        @port = nil
-        @standalone = false
-        @verify = true
-      end
-
-      dsl do
-        def port port
-          self.port = port
-        end
-
-        def standalone standalone
-          self.standalone = standalone
-        end
-
-        def verify verify
-          self.verify = verify
-        end
-      end
-
-      def finalize
-        validate
-        register_mock_service
-        configure_consumer_contract_builder
-      end
-
-      private
-
-      def register_mock_service
-        unless standalone
-          AppManager.instance.register_mock_service_for provider_name, "http://localhost:#{port}"
-        end
-      end
-
-      def configure_consumer_contract_builder
-        consumer_contract_builder = create_consumer_contract_builder
-        create_consumer_contract_builders_method consumer_contract_builder
-        setup_verification(consumer_contract_builder) if verify
-        consumer_contract_builder
-      end
-
-      def create_consumer_contract_builder
-        consumer_contract_builder_fields = {
-          :consumer_name => consumer_name,
-          :provider_name => provider_name,
-          :pactfile_write_mode => Pact.configuration.pactfile_write_mode,
-          :port => port
-        }
-        Pact::Consumer::ConsumerContractBuilder.new consumer_contract_builder_fields
-      end
-
-      def setup_verification consumer_contract_builder
-        Pact.configuration.add_provider_verification do | example_description |
-          consumer_contract_builder.verify example_description
-        end
-      end
-
-       # 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_consumer_contract_builders_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::Configuration::ConfigurationExtensions)

data/lib/pact/consumer/configuration/configuration_extensions.rb

@@ -0,0 +1,15 @@
+module Pact
+  module Consumer
+    module Configuration
+
+      module ConfigurationExtensions
+        def add_provider_verification &block
+          provider_verifications << block
+        end
+        def provider_verifications
+          @provider_verifications ||= []
+        end
+      end
+    end
+  end
+end

data/lib/pact/consumer/configuration/dsl.rb

@@ -0,0 +1,12 @@
+require 'pact/consumer/configuration/service_consumer'
+
+module Pact
+
+  module Consumer
+    module DSL
+      def service_consumer name, &block
+        Configuration::ServiceConsumer.build(name, &block)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,89 @@
+require 'pact/consumer/app_manager'
+require 'pact/consumer/consumer_contract_builder'
+require 'pact/consumer/consumer_contract_builders'
+
+module Pact
+  module Consumer
+    module Configuration
+      class MockService
+
+        extend Pact::DSL
+
+        attr_accessor :port, :standalone, :verify, :provider_name, :consumer_name
+
+        def initialize name, consumer_name, provider_name
+          @name = name
+          @consumer_name = consumer_name
+          @provider_name = provider_name
+          @port = nil
+          @standalone = false
+          @verify = true
+        end
+
+        dsl do
+          def port port
+            self.port = port
+          end
+
+          def standalone standalone
+            self.standalone = standalone
+          end
+
+          def verify verify
+            self.verify = verify
+          end
+        end
+
+        def finalize
+          validate
+          register_mock_service
+          configure_consumer_contract_builder
+        end
+
+        private
+
+        def register_mock_service
+          unless standalone
+            AppManager.instance.register_mock_service_for provider_name, "http://localhost:#{port}"
+          end
+        end
+
+        def configure_consumer_contract_builder
+          consumer_contract_builder = create_consumer_contract_builder
+          create_consumer_contract_builders_method consumer_contract_builder
+          setup_verification(consumer_contract_builder) if verify
+          consumer_contract_builder
+        end
+
+        def create_consumer_contract_builder
+          consumer_contract_builder_fields = {
+            :consumer_name => consumer_name,
+            :provider_name => provider_name,
+            :pactfile_write_mode => Pact.configuration.pactfile_write_mode,
+            :port => port
+          }
+          Pact::Consumer::ConsumerContractBuilder.new consumer_contract_builder_fields
+        end
+
+        def setup_verification consumer_contract_builder
+          Pact.configuration.add_provider_verification do | example_description |
+            consumer_contract_builder.verify example_description
+          end
+        end
+
+         # 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_consumer_contract_builders_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
+end

data/lib/pact/consumer/configuration/service_consumer.rb

@@ -0,0 +1,51 @@
+require 'pact/shared/dsl'
+
+module Pact
+  module Consumer
+    module Configuration
+      class ServiceConsumer
+
+        extend Pact::DSL
+
+        attr_accessor :app, :port, :name
+
+        def initialize name
+          @name = name
+          @app = nil
+          @port = nil
+        end
+
+        dsl do
+          def app app
+            self.app = app
+          end
+
+          def port port
+            self.port = port
+          end
+
+          def has_pact_with service_provider_name, &block
+            ServiceProvider.build(service_provider_name, name, &block)
+          end
+        end
+
+        def finalize
+          validate
+          register_consumer_app if @app
+        end
+
+        private
+
+        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 register_consumer_app
+          Pact::Consumer::AppManager.instance.register app, port
+        end
+      end
+    end
+  end
+end

data/lib/pact/consumer/configuration/service_provider.rb

@@ -0,0 +1,40 @@
+require 'pact/shared/dsl'
+require 'pact/consumer/configuration/mock_service'
+
+module Pact
+  module Consumer
+    module Configuration
+      class ServiceProvider
+
+        extend Pact::DSL
+
+        attr_accessor :service, :consumer_name, :name
+
+        def initialize name, consumer_name
+          @name = name
+          @service = nil
+          @consumer_name = consumer_name
+        end
+
+        dsl do
+          def mock_service name, &block
+            self.service = MockService.build(name, consumer_name, self.name, &block)
+          end
+        end
+
+        def finalize
+          validate
+        end
+
+        private
+
+        def validate
+          raise "Please configure a service for #{name}" unless service
+        end
+
+      end
+
+    end
+  end
+
+end

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

@@ -1,5 +1,3 @@
-require 'pact/matchers/diff_decorator'
-
 module Pact
   module Consumer
 
@@ -37,7 +35,9 @@ module Pact
       attr_accessor :candiate_diffs
 
       class CandidateDiff
+
         attr_accessor :candidate_interaction, :actual_request
+
         def initialize candidate_interaction, actual_request
           @candidate_interaction = candidate_interaction
           @actual_request = actual_request
@@ -56,7 +56,7 @@ module Pact
         def to_s
           [
             "Diff with interaction: #{candidate_interaction.description_with_provider_state_quoted}",
-            Pact::Matchers::DiffDecorator.new(diff).to_s
+            Pact.configuration.diff_formatter.call(diff, {colour: false})
           ].join("\n")
         end
 

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

@@ -22,8 +22,8 @@ module Pact
       def respond env
         interaction = Interaction.from_hash(JSON.load(env['rack.input'].string))
         interaction_list.add interaction
-        logger.info "Registered expected interaction #{interaction.request.method_and_path} for #{name}"
-        logger.ap interaction.as_json
+        logger.info "Registered expected interaction #{interaction.request.method_and_path}"
+        logger.debug JSON.pretty_generate interaction
         [200, {}, ['Added interaction']]
       end
     end

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

@@ -30,7 +30,7 @@ module Pact
       def find_response request_hash
         actual_request = Request::Actual.from_hash(request_hash)
         logger.info "#{name} received request #{actual_request.method_and_path}"
-        logger.ap actual_request.as_json
+        logger.debug JSON.pretty_generate actual_request
         candidate_interactions = interaction_list.find_candidate_interactions actual_request
         matching_interactions = find_matching_interactions actual_request, from: candidate_interactions
 
@@ -91,10 +91,9 @@ module Pact
       end
 
       def log_unrecognised_request_and_interaction_diff interaction_mismatch
-        logger.error "No interaction found on #{name} for #{interaction_mismatch.actual_request.method_and_path}"
+        logger.error "No matching interaction found on #{name} for #{interaction_mismatch.actual_request.method_and_path}"
         logger.error 'Interaction diffs for that route:'
-        logger.ap(interaction_mismatch.to_hash, :error)
-        logger.error("Interaction diffs for that route in text format:\n#{interaction_mismatch.to_s}")
+        logger.error(interaction_mismatch.to_s)
       end
 
       def handle_unrecognised_request actual_request, candidate_interactions