pact 1.1.0.rc2 → 1.1.0.rc3

data/lib/pact/provider/configuration.rb

@@ -1,180 +1,7 @@
-require 'pact/provider/pact_verification'
-require 'pact/shared/dsl'
+require 'pact/provider/configuration/dsl'
+require 'pact/provider/configuration/configuration_extension'
 require 'pact/provider/state/provider_state'
-require 'pact/provider/state/provider_state_configured_modules'
-require 'pact/matchers/plus_minus_diff_decorator'
-require 'pact/matchers/nested_json_diff_decorator'
 
-# TODO break this class up!
-
-module Pact
-
-  module Provider
-
-    module DSL
-      def service_provider name, &block
-        Configuration::ServiceProviderDSL.build(name, &block)
-      end
-    end
-
-    Pact.send(:extend, Pact::Provider::DSL)
-    Pact.send(:extend, Pact::Provider::State::DSL)
-
-    module Configuration
-
-      module ConfigurationExtension
-
-        DIFF_FORMATTERS = {
-          :nested_json => Pact::Matchers::NestedJsonDiffDecorator,
-          :plus_and_minus => Pact::Matchers::PlusMinusDiffDecorator
-        }
-
-        def provider= provider
-          @provider = provider
-        end
-
-        def provider
-          if defined? @provider
-            @provider
-          else
-            raise "Please configure your provider. See the Provider section in the README for examples."
-          end
-        end
-
-        def add_pact_verification verification
-          pact_verifications << verification
-        end
-
-        def pact_verifications
-          @pact_verifications ||= []
-        end
-
-        def config_ru_path
-          @config_ru_path ||= './config.ru'
-        end
-
-        def config_ru_path= config_ru_path
-          @config_ru_path = config_ru_path
-        end
-
-        def color_enabled
-          # Can't use ||= when the variable might be false, it will execute the expression if it's false
-          defined?(@color_enabled) ? @color_enabled : true
-        end
-
-        def color_enabled= color_enabled
-          @color_enabled = color_enabled
-        end
-
-        def diff_format= diff_format
-          @diff_format = diff_format
-        end
-
-        def diff_format
-          @diff_format ||= :nested_json
-        end
-
-        def diff_formatter_class
-          DIFF_FORMATTERS.fetch(diff_format)
-        end
-
-        def include mod
-          Pact::Provider::State::ProviderStateConfiguredModules.instance_eval do
-            include mod
-          end
-        end
-
-      end
-
-      Pact::Configuration.send(:include, ConfigurationExtension)
-
-      class ServiceProviderConfig
-
-        def initialize &app_block
-          @app_block = app_block
-        end
-
-        def app
-          @app_block.call
-        end
-      end
-
-      class PactVerification
-        extend Pact::DSL
-
-        attr_accessor :consumer_name, :pact_uri, :ref
-
-        def initialize consumer_name, options = {}
-          @consumer_name = consumer_name
-          @ref = options.fetch(:ref, :head)
-          @pact_uri = nil
-        end
-
-        dsl do
-          def pact_uri pact_uri
-            self.pact_uri = pact_uri
-          end
-        end
-
-        def finalize
-          validate
-          create_pact_verification
-        end
-
-        private
-
-        def create_pact_verification
-          verification = Pact::Provider::PactVerification.new(consumer_name, pact_uri, ref)
-          Pact.configuration.add_pact_verification verification
-        end
-
-        def validate
-          raise "Please provide a pact_uri for the verification" unless pact_uri
-        end
-
-      end
-
-      class ServiceProviderDSL
-        extend Pact::DSL
-
-        attr_accessor :name, :app_block
-
-        CONFIG_RU_APP = lambda { Rack::Builder.parse_file(Pact.configuration.config_ru_path).first }
-
-        def initialize name
-          @name = name
-          @app_block = CONFIG_RU_APP
-        end
-
-        dsl do
-          def app &block
-            self.app_block = block
-          end
-
-          def honours_pact_with consumer_name, options = {}, &block
-            create_pact_verification consumer_name, options, &block
-          end
-        end
-
-        def create_pact_verification consumer_name, options, &block
-          PactVerification.build(consumer_name, options, &block)
-        end
-
-        def finalize
-          validate
-          create_service_provider
-        end
-
-        private
-
-        def validate
-          raise "Please provide a name for the Provider" unless name && !name.strip.empty?
-        end
-
-        def create_service_provider
-          Pact.configuration.provider = ServiceProviderConfig.new(&@app_block)
-        end
-      end
-    end
-  end
-end
+Pact.send(:extend, Pact::Provider::DSL)
+Pact.send(:extend, Pact::Provider::State::DSL)
+Pact::Configuration.send(:include, Pact::Provider::Configuration::ConfigurationExtension)

data/lib/pact/provider/configuration/configuration_extension.rb

@@ -0,0 +1,58 @@
+require 'pact/provider/state/provider_state'
+require 'pact/provider/state/provider_state_configured_modules'
+
+module Pact
+
+  module Provider
+
+    module Configuration
+
+      module ConfigurationExtension
+
+        def provider= provider
+          @provider = provider
+        end
+
+        def provider
+          if defined? @provider
+            @provider
+          else
+            raise "Please configure your provider. See the Provider section in the README for examples."
+          end
+        end
+
+        def add_pact_verification verification
+          pact_verifications << verification
+        end
+
+        def pact_verifications
+          @pact_verifications ||= []
+        end
+
+        def config_ru_path
+          @config_ru_path ||= './config.ru'
+        end
+
+        def config_ru_path= config_ru_path
+          @config_ru_path = config_ru_path
+        end
+
+        def color_enabled
+          # Can't use ||= when the variable might be false, it will execute the expression if it's false
+          defined?(@color_enabled) ? @color_enabled : true
+        end
+
+        def color_enabled= color_enabled
+          @color_enabled = color_enabled
+        end
+
+        def include mod
+          Pact::Provider::State::ProviderStateConfiguredModules.instance_eval do
+            include mod
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+require 'pact/provider/configuration/service_provider_dsl'
+
+module Pact
+
+  module Provider
+
+    module DSL
+      def service_provider name, &block
+        Configuration::ServiceProviderDSL.build(name, &block)
+      end
+    end
+  end
+end

data/lib/pact/provider/configuration/pact_verification.rb

@@ -0,0 +1,46 @@
+require 'pact/provider/pact_verification'
+require 'pact/shared/dsl'
+
+module Pact
+  module Provider
+
+    module Configuration
+
+      class PactVerification
+
+        extend Pact::DSL
+
+        attr_accessor :consumer_name, :pact_uri, :ref
+
+        def initialize consumer_name, options = {}
+          @consumer_name = consumer_name
+          @ref = options.fetch(:ref, :head)
+          @pact_uri = nil
+        end
+
+        dsl do
+          def pact_uri pact_uri
+            self.pact_uri = pact_uri
+          end
+        end
+
+        def finalize
+          validate
+          create_pact_verification
+        end
+
+        private
+
+        def create_pact_verification
+          verification = Pact::Provider::PactVerification.new(consumer_name, pact_uri, ref)
+          Pact.configuration.add_pact_verification verification
+        end
+
+        def validate
+          raise "Please provide a pact_uri for the verification" unless pact_uri
+        end
+
+      end
+    end
+  end
+end

data/lib/pact/provider/configuration/service_provider_config.rb

@@ -0,0 +1,16 @@
+module Pact
+  module Provider
+    module Configuration
+      class ServiceProviderConfig
+
+        def initialize &app_block
+          @app_block = app_block
+        end
+
+        def app
+          @app_block.call
+        end
+      end
+    end
+  end
+end

data/lib/pact/provider/configuration/service_provider_dsl.rb

@@ -0,0 +1,54 @@
+require 'pact/provider/configuration/pact_verification'
+require 'pact/provider/configuration/service_provider_config'
+
+module Pact
+
+  module Provider
+
+    module Configuration
+
+      class ServiceProviderDSL
+
+        extend Pact::DSL
+
+        attr_accessor :name, :app_block
+
+        CONFIG_RU_APP = lambda { Rack::Builder.parse_file(Pact.configuration.config_ru_path).first }
+
+        def initialize name
+          @name = name
+          @app_block = CONFIG_RU_APP
+        end
+
+        dsl do
+          def app &block
+            self.app_block = block
+          end
+
+          def honours_pact_with consumer_name, options = {}, &block
+            create_pact_verification consumer_name, options, &block
+          end
+        end
+
+        def create_pact_verification consumer_name, options, &block
+          PactVerification.build(consumer_name, options, &block)
+        end
+
+        def finalize
+          validate
+          create_service_provider
+        end
+
+        private
+
+        def validate
+          raise "Please provide a name for the Provider" unless name && !name.strip.empty?
+        end
+
+        def create_service_provider
+          Pact.configuration.provider = ServiceProviderConfig.new(&@app_block)
+        end
+      end
+    end
+  end
+end

data/lib/pact/provider/matchers.rb

@@ -1,25 +1,33 @@
-require 'pact/term'
-require 'awesome_print'
-require 'pact/matchers'
-require 'awesome_print'
 require 'rspec'
-require 'pact/matchers/nested_json_diff_decorator'
-require 'pact/matchers/diff_decorator'
+require 'pact/matchers'
+require 'pact/provider/matchers/messages'
 
 RSpec::Matchers.define :match_term do |expected|
+
+  include Pact::Matchers
+  include Pact::Matchers::Messages
+
+  match do |actual|
+    (@difference = diff(expected, actual)).empty?
+  end
+
+  failure_message_for_should do | actual |
+    match_term_failure_message @difference, ::RSpec.configuration.color_enabled
+  end
+
+end
+
+RSpec::Matchers.define :match_header do |header_name, expected|
+
   include Pact::Matchers
+  include Pact::Matchers::Messages
 
   match do |actual|
-    if (difference = diff(expected, actual)).any?
-      @diff_decorator = Pact.configuration.diff_formatter_class.new(difference)
-      false
-    else
-      true
-    end
+    diff(expected, actual).empty?
   end
 
   failure_message_for_should do | actual |
-    @diff_decorator.to_s
+    match_header_failure_message header_name, expected, actual
   end
 
 end

data/lib/pact/provider/matchers/messages.rb

@@ -0,0 +1,43 @@
+require 'term/ansicolor'
+require 'pact/term'
+
+module Pact
+  module Matchers
+    module Messages
+
+      def match_term_failure_message diff, color_enabled
+        message = Pact.configuration.diff_formatter.call(diff)
+
+        if color_enabled
+          # RSpec wraps each line in the failure message with failure_color, turning it red.
+          # To ensure the lines in the diff that should be white, stay white, put an
+          # ANSI reset at the start of each line.
+          message.split("\n").collect{ |line| ::Term::ANSIColor.reset + line }.join("\n")
+        else
+          message
+        end
+
+      end
+
+      def match_header_failure_message header_name, expected, actual
+        "Expected header \"#{header_name}\" to #{expected_desc(expected)}, but was #{actual_desc(actual)}"
+      end
+
+      private
+
+      def expected_desc expected
+        case expected
+        when Pact::Term then "match #{expected.matcher.inspect}"
+        when NilClass then "be nil"
+        else
+          "match \"#{expected}\""
+        end
+      end
+
+      def actual_desc actual
+        actual.nil? ? 'nil' : '"' + actual + '"'
+      end
+
+    end
+  end
+end