pact 1.0.9 → 1.0.10

data/lib/pact/provider/request.rb

@@ -0,0 +1,59 @@
+require 'json'
+require 'pact/reification'
+require 'pact/shared/null_expectation'
+
+module Pact
+  module Provider
+    module Request
+      class Replayable
+
+        def initialize expected_request
+          @expected_request = expected_request
+        end
+
+        def method
+          expected_request.method
+        end
+
+        def path
+          expected_request.full_path
+        end
+
+        def body
+          case expected_request.body
+          when String then expected_request.body
+          when NullExpectation then ''
+          else
+            reified_body
+          end
+        end
+
+        def headers
+          request_headers = {}
+          return request_headers if expected_request.headers.is_a?(Pact::NullExpectation)
+          expected_request.headers.each do |key, value|
+            key = key.upcase
+            if key.match(/CONTENT.TYPE/)
+              request_headers['CONTENT_TYPE'] = value
+            else
+              request_headers['HTTP_' + key.to_s] = value
+            end
+          end
+          request_headers
+        end
+
+        private
+        attr_reader :expected_request
+
+        def reified_body
+          rb = Pact::Reification.from_term(expected_request.body)
+          if rb.is_a?(String)
+            rb
+          else
+            JSON.dump(rb)
+          end
+        end
+      end      
+    end
+  end
+end

data/lib/pact/provider/rspec.rb

@@ -1,9 +1,9 @@
 require 'open-uri'
 require 'pact/consumer_contract'
 require 'pact/json_warning'
-require_relative 'matchers'
-require_relative 'test_methods'
-require 'pact/provider/dsl'
+require 'pact/provider/matchers'
+require 'pact/provider/test_methods'
+require 'pact/provider/configuration'
 
 module Pact
   module Provider
@@ -90,7 +90,7 @@ module Pact
             if response['body']
               it "has a matching body" do
                 logger.debug "Response body is #{last_response.body}"
-                expect(parse_entity_from_response(last_response)).to match_term response['body']
+                expect(parse_body_from_response(last_response)).to match_term response['body']
               end
             end
           end
@@ -126,5 +126,4 @@ RSpec.configure do |config|
   config.extend Pact::Provider::RSpec::ClassMethods
   config.include Pact::Provider::RSpec::InstanceMethods
   config.include Pact::Provider::TestMethods
-  config.include Pact::Provider::TestMethods
 end

data/lib/pact/provider/test_methods.rb

@@ -1,7 +1,8 @@
 require 'pact/logging'
 require 'rack/test'
-require 'pact/reification'
+require 'pact/consumer_contract/interaction'
 require 'pact/provider/provider_state'
+require 'pact/provider/request'
 
 module Pact
   module Provider
@@ -10,12 +11,20 @@ module Pact
       include Pact::Logging
       include Rack::Test::Methods
 
-      def parse_entity_from_response response
-        case response.headers['Content-Type']
+      def replay_interaction interaction
+        request = Request::Replayable.new(interaction.request)
+        args = [request.path, request.body, request.headers]
+
+        logger.debug "Sending #{request.method} with #{args}"
+        self.send(request.method, *args)
+      end
+
+      def parse_body_from_response rack_response
+        case rack_response.headers['Content-Type']
         when /json/
-          JSON.load(response.body)
+          JSON.load(rack_response.body)
         else
-          response.body
+          rack_response.body
         end
       end
 
@@ -31,53 +40,6 @@ module Pact
         end
       end
 
-      def replay_interaction interaction
-        request = interaction.request
-        path = request_path(request)
-        args = [path, request_body(request)]
-
-        if !request.headers.nil?
-          args << request_headers(request)
-        end
-
-        logger.debug "Sending #{request.method} with #{args}"
-        self.send(request.method, *args)
-      end
-
-      private
-
-      def request_headers request
-        request_headers = {}
-        request.headers.each do |key, value|
-          key = key.upcase
-          if key.match(/CONTENT.TYPE/)
-            request_headers['CONTENT_TYPE'] = value
-          else
-            request_headers['HTTP_' + key.to_s] = value
-          end
-        end
-        request_headers
-      end
-
-      def request_path request
-        path = request.path
-        query = request.query
-        if query && !query.empty?
-          query = query.generate if query.kind_of? Pact::Term
-          path += "?" + query
-        end
-        path
-      end
-
-      def request_body request
-        body = request.body
-        if !body.nil? #TODO - write test for this where this is a NullExpectation
-          body = JSON.dump(Pact::Reification.from_term(body))
-        else
-          body = ""
-        end
-      end
-
       def get_provider_state provider_state_name, consumer
         unless provider_state = ProviderState.get(provider_state_name, :for => consumer)
           extra = consumer ? " for consumer \"#{consumer}\"" : ""

data/lib/pact/shared/dsl.rb

@@ -0,0 +1,20 @@
+require 'delegate'
+
+module Pact
+  # Ripped from http://blog.joecorcoran.co.uk/2013/09/04/simple-pattern-ruby-dsl
+  module DSL
+    def build(*args, &block)
+      base = self.new(*args)
+      delegator_klass = self.const_get('DSLDelegator')
+      delegator = delegator_klass.new(base)
+      delegator.instance_eval(&block)
+      base.finalize
+      base
+    end
+
+    def dsl(&block)
+      delegator_klass = Class.new(SimpleDelegator, &block)
+      self.const_set('DSLDelegator', delegator_klass)
+    end
+  end
+end

data/lib/pact/shared/key_not_found.rb

@@ -0,0 +1,24 @@
+module Pact
+  class KeyNotFound
+    def == other
+      other.is_a? KeyNotFound
+    end
+
+    def eql? other
+      self == other
+    end
+
+    def to_s
+      "<key not found>"
+    end
+
+    def to_json options = {}
+      to_s
+    end
+
+    def empty?
+      true
+    end
+  end  
+
+end

data/lib/pact/shared/null_expectation.rb

@@ -0,0 +1,31 @@
+module Pact
+  class NullExpectation
+    def to_s
+      "<No expectation>"
+    end
+
+    def ==(other_object)
+     other_object.is_a? NullExpectation
+    end
+
+    def ===(other_object)
+     other_object.is_a? NullExpectation
+    end
+
+    def eql?(other_object)
+      self == other_object
+    end
+
+    def hash
+      2934820948209428748274238642672
+    end
+
+    def empty?
+      true
+    end
+
+    def nil?
+      true
+    end
+  end
+end

data/lib/pact/shared/request.rb

@@ -0,0 +1,68 @@
+require 'pact/matchers'
+require 'pact/symbolize_keys'
+
+module Pact
+
+  module Request
+
+    class Base
+      include Pact::Matchers
+      include Pact::SymbolizeKeys
+      extend Pact::Matchers
+
+      attr_reader :method, :path, :headers, :body, :query, :options
+
+      def initialize(method, path, headers, body, query)
+        @method = method.to_s
+        @path = path.chomp('/')
+        @headers = headers
+        @body = body
+        @query = query
+      end
+
+      def to_json(options = {})
+        as_json.to_json(options)
+      end
+
+      def as_json
+        base_json = {
+          method: method,
+          path: path,
+        }
+
+        base_json.merge!(body: body) unless body.is_a? self.class.key_not_found.class
+        base_json.merge!(headers: headers) unless headers.is_a? self.class.key_not_found.class
+        base_json.merge!(query: query) unless query.is_a? self.class.key_not_found.class
+        base_json
+      end
+
+      def method_and_path
+        "#{method.upcase} #{path}"
+      end
+
+      def full_path
+        fp = ''
+        if path.empty?
+          fp << "/"
+        else
+          fp << path
+        end
+        if query && !query.empty?
+          fp << ("?" + (query.kind_of?(Pact::Term) ? query.generate : query))
+        end
+        fp
+      end
+
+      protected
+
+      def self.key_not_found
+        raise NotImplementedError
+      end      
+
+      def as_json_without_body
+        keep_keys = [:method, :path, :headers, :query]
+        as_json.reject{ |key, value| !keep_keys.include? key }
+      end
+    end
+  end
+end

data/lib/pact/something_like.rb

@@ -1,6 +1,12 @@
+require 'pact/symbolize_keys'
 module Pact
 
+  # Specifies that the actual object should be considered a match if
+  # it includes the same keys, and the values of the keys are of the same class.
+
   class SomethingLike
+    include SymbolizeKeys
+
     attr_reader :contents
 
     def initialize contents
@@ -19,7 +25,7 @@ module Pact
     end
 
     def self.json_create hash
-      new(hash['contents'])
+      new(symbolize_keys(hash))
     end
 
     def generate

data/lib/pact/symbolize_keys.rb

@@ -0,0 +1,12 @@
+module Pact
+  module SymbolizeKeys
+
+    def self.included(base)
+      base.extend(self)
+    end
+
+    def symbolize_keys hash
+      hash.inject({}) { |memo, (k,v)| memo[k.to_sym] = v; memo }
+    end
+  end
+end

data/lib/pact/tasks.rb

@@ -1,2 +1,2 @@
 load File.expand_path('../tasks/pact.rake', File.dirname(__FILE__))
-require 'pact/verification_task'
+require 'pact/tasks/verification_task'

data/lib/pact/tasks/task_helper.rb

@@ -0,0 +1,23 @@
+module Pact
+  module TaskHelper
+    def failure_message
+      redify(
+        "\n* * * * * * * * * * * * * * * * * * *\n" +
+        "Provider did not honour pact file.\nSee\n * #{Pact.configuration.log_path}\n * #{Pact.configuration.tmp_dir}\nfor logs and pact files." +
+        "\n* * * * * * * * * * * * * * * * * * *\n\n"
+      )
+    end
+
+    def redify string
+      "\e[31m#{string}\e[m"
+    end
+
+    def handle_verification_failure
+      exit_status = yield
+      if exit_status != 0
+        $stderr.puts failure_message
+        fail
+      end
+    end
+  end
+end

data/lib/pact/{verification_task.rb → tasks/verification_task.rb}

@@ -1,14 +1,14 @@
 require 'rake/tasklib'
 require 'pact/provider/pact_spec_runner'
-require_relative 'pact_task_helper'
-require_relative 'provider/verification_report'
+require 'pact/provider/verification_report'
+require 'pact/tasks/task_helper'
 
 =begin
 	To create a rake pact:verify:<something> task
 
 	Pact::VerificationTask.new(:head) do | pact |
 	  pact.uri 'http://master.cd.vpc.realestate.com.au/browse/BIQ-MAS/latestSuccessful/artifact/JOB2/Pacts/mas-contract_transaction_service.json'
-    pact.uri 'http://master.cd.vpc.realestate.com.au/browse/BIQ-IMAGINARY-CONSUMER/latestSuccessful/artifact/JOB2/Pacts/imaginary_consumer-contract_transaction_service.json'
+     pact.uri 'http://master.cd.vpc.realestate.com.au/browse/BIQ-IMAGINARY-CONSUMER/latestSuccessful/artifact/JOB2/Pacts/imaginary_consumer-contract_transaction_service.json'
 	end
 
 	The pact.uri may be a local file system path or a remote URL.
@@ -33,7 +33,7 @@ module Pact
 	class VerificationTask < ::Rake::TaskLib
 	  attr_reader :pact_spec_config
 
-	  include PactTaskHelper
+	  include Pact::TaskHelper
 	  def initialize(name)
 	    @pact_spec_config = []
 	    @name = name

data/lib/pact/version.rb

@@ -1,3 +1,3 @@
 module Pact
-  VERSION = "1.0.9"
+  VERSION = "1.0.10"
 end

data/lib/tasks/pact.rake

@@ -4,14 +4,15 @@ namespace :pact do
   desc "Verifies the pact files configured in the pact_helper.rb against this service provider."
   task :verify do
     require 'pact/provider'
-    require 'pact/pact_task_helper'
+    require 'pact/tasks/task_helper'
     require 'pact/provider/client_project_pact_helper'
 
-    include PactTaskHelper
+    include Pact::TaskHelper
 
     handle_verification_failure do
       pact_verifications = Pact.configuration.pact_verifications
       verification_configs = pact_verifications.collect { | pact_verification | { :uri => pact_verification.uri }}
+      raise "Please configure a pact to verify" if verification_configs.empty?
       Pact::Provider::PactSpecRunner.new(verification_configs).run
     end
   end
@@ -19,9 +20,9 @@ namespace :pact do
   desc "Verifies the pact at the given URI against this service provider."
   task 'verify:at', :pact_uri do | t, args |
     require 'pact/provider'
-    require 'pact/pact_task_helper'
+    require 'pact/tasks/task_helper'
 
-    include PactTaskHelper
+    include Pact::TaskHelper
 
     handle_verification_failure do
       puts "Verifying pact at uri #{args[:pact_uri]}"