pact 1.1.0.rc4 → 1.1.0.rc5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pact (1.1.0.rc4)
+    pact (1.1.0.rc5)
       awesome_print (~> 1.1)
       find_a_port (~> 1.0.1)
       json

data/lib/pact/matchers/matchers.rb

@@ -20,11 +20,11 @@ module Pact
     DEFAULT_OPTIONS = {allow_unexpected_keys: true, type: false}.freeze
 
     def diff expected, actual, opts = {}
-      calculate_diff(expected, actual, DEFAULT_OPTIONS.merge(opts))
+      calculate_diff(Pact::Term.unpack_regexps(expected), actual, DEFAULT_OPTIONS.merge(opts))
     end
 
     def type_diff expected, actual, opts = {}
-      calculate_diff expected, actual, DEFAULT_OPTIONS.merge(opts).merge(type: true)
+      calculate_diff Pact::Term.unpack_regexps(expected), actual, DEFAULT_OPTIONS.merge(opts).merge(type: true)
     end
 
     private
@@ -34,7 +34,6 @@ module Pact
       case expected
       when Hash then hash_diff(expected, actual, options)
       when Array then array_diff(expected, actual, options)
-      when Pact::Term then calculate_diff(expected.matcher, actual, options)
       when Regexp then regexp_diff(expected, actual, options)
       when Pact::SomethingLike then calculate_diff(expected.contents, actual, options.merge(:type => true))
       else object_diff(expected, actual, options)

data/lib/pact/matchers/unix_diff_formatter.rb

@@ -71,9 +71,9 @@ module Pact
 
       def copy_diff difference, target
         if target == :actual
-          copy_object difference.actual, target
+          handle difference.actual, target
         else
-          copy_object difference.expected, target
+          handle difference.expected, target
         end
       end
 

data/lib/pact/provider/test_methods.rb

@@ -18,9 +18,9 @@ module Pact
         request = Request::Replayable.new(interaction.request)
         args = [request.path, request.body, request.headers]
 
-        logger.info "Sending #{request.method} request to path: \"#{request.path}\" with headers: #{request.headers}, see debug logs for body"
+        logger.info "Sending #{request.method.upcase} request to path: \"#{request.path}\" with headers: #{request.headers}, see debug logs for body"
         logger.debug "body :#{request.body}"
-        response = self.send(request.method, *args)
+        response = self.send(request.method.downcase, *args)
         logger.info "Received response with status: #{response.status}, headers: #{response.headers}, see debug logs for body"
         logger.debug "body: #{response.body}"
       end

data/lib/pact/term.rb

@@ -12,6 +12,16 @@ module Pact
       new(generate: obj['data']['generate'], matcher: obj['data']['matcher'])
     end
 
+    def self.unpack_regexps source
+      case source
+      when Pact::Term then source.matcher
+      when Array then unpack_regexps_from_array source
+      when Hash then unpack_regexps_from_hash source
+      else
+        source
+      end
+    end
+
     def initialize(attributes = {})
       @generate = attributes[:generate]
       @matcher = attributes[:matcher]
@@ -57,5 +67,19 @@ module Pact
       false
     end
 
+    private
+
+    def self.unpack_regexps_from_array source
+      source.each_with_object([]) do | item, destination |
+        destination << unpack_regexps(item)
+      end
+    end
+
+    def self.unpack_regexps_from_hash source
+      source.keys.each_with_object({}) do | key, destination |
+        destination[key] = unpack_regexps source[key]
+      end
+    end
+
   end
 end

data/lib/pact/version.rb

@@ -1,3 +1,3 @@
 module Pact
-  VERSION = "1.1.0.rc4"
+  VERSION = "1.1.0.rc5"
 end

data/spec/lib/pact/matchers/embedded_diff_formatter_spec.rb

@@ -22,9 +22,12 @@ module Pact
 
       describe ".call" do
 
-        let(:colour) { true }
+        let(:colour) { false }
 
         context "when color_enabled is true" do
+
+          let(:colour) { true }
+
           it "returns nicely formatted json" do
             expect(subject.split("\n").size).to eq 6
           end
@@ -49,6 +52,16 @@ module Pact
           end
         end
 
+        context "with a Pact::Term" do
+          let(:diff) { {thing: Difference.new(Pact::Term.new(generate: "Joe", matcher: /Jo/), "Mary")} }
+
+          xit "displays the matcher from the Pact::Term" do
+            expect(subject).to_not include("Pact::Term")
+            expect(subject).to include("/Jo/")
+          end
+
+        end
+
         context "when no options are specified" do
           subject { EmbeddedDiffFormatter.call(diff) }
 

data/spec/lib/pact/matchers/matchers_spec.rb

@@ -144,6 +144,17 @@ module Pact::Matchers
         end
       end
 
+      context "when a term is expected inside a missing hash" do
+        let(:expected) { {a: {b: Pact::Term.new(:matcher => /p/, :generate => 'apple')}} }
+        context "and a non matching value is found" do
+          let(:actual) { {a: nil} }
+          let(:difference) { {a: Difference.new({b: /p/}, nil)} }
+          it "returns the diff with the regexp unpacked" do
+            expect(type_diff(expected, actual)).to eq difference
+          end
+        end
+      end
+
       context "when unexpected keys are allowed" do
         let(:expected) { { a: 'b' } }
         let(:actual) { {a: 'c', d: 'e'} }

data/spec/lib/pact/term_spec.rb

@@ -74,5 +74,16 @@ module Pact
 
     end
 
+    describe 'unpack_regexps' do
+      let(:term) { Term.new(generate: 'some', matcher: /s/) }
+      let(:body) { [{a: [{b: term}], c:term, d: 1, e: 'blah'}] }
+      let(:expected) { [{:a=>[{:b=>/s/}], :c=>/s/, :d=>1, :e=>"blah"}] }
+
+      it "returns a structure with the Pact::Terms replaced by their regexps" do
+        expect(Term.unpack_regexps(body)).to eq expected
+      end
+
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc4
+  version: 1.1.0.rc5
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -545,6 +545,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2010055491474427201
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: