pact-support 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c22fbc42f806850fdf59aae86c0ab60221e53b31
-  data.tar.gz: d861be0013364c930b5d092caa37fab70a3d9c5c
+  metadata.gz: 9c27327d015a0d365e6fb40d46bfaf51988a54bf
+  data.tar.gz: 8f8c448fd177b5aca19761c205cc3c94d8ceecdb
 SHA512:
-  metadata.gz: ce97bbeb237b4ed9dd74251120aab5a1ad6a452057c0fdf4f7236c811fe35a944bc3a89263983782bbc304104ea2e2f36b37a2b40c0455cf8c647ad26e0c249e
-  data.tar.gz: 92b643e2648be79ccf6e7221d7d3a30e3a735fe6cc04f0cede398a7ac6bc720a3d0564d8da9ade013003d616c87b39ae1bff815bb7d8dbb5346f8cb3764b4d0c
+  metadata.gz: 216d7e4778f28365ef8c22a3916a9bfc9d54bcc885e9f0c997938afbaf9a63b5d853f8d1a458caef2973c8874558551fa8fe923edb6ac789fe2bac0202a89e6a
+  data.tar.gz: a5cab6e546286061eabbd519163ed7ced91683ac4d2c9e5192e60cc15c8e3583349a595b32237bcbde4a8076e3fdded6b969e33adbe630261343aca29c85492e

data/CHANGELOG.md

@@ -2,16 +2,20 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)'
 
+### 0.0.4 (20 October 2014)
+
+* ebe5e32 - Added differ for application/x-www-form-urlencoded bodies. (bethesque, Mon Oct 20 20:26:13 2014 +1100)
+
 ### 0.0.3 (17 October 2014)
 
 * bab0b34 - Added possibility to provide queries as Hash. Then order of parameters in the query is not longer relevant. (André Allavena, Tue Oct 14 00:24:38 2014 +1000)
 
 ### 0.0.2 (12 October 2014)
 
-  * e7080fe - Added a QueryString class in preparation for a QueryHash class (Beth, Sun Oct 12 14:32:15 2014 +1100)
-  * 8839151 - Added Travis config (Beth, Sun Oct 12 12:31:44 2014 +1100)
-  * 81ade54 - Removed CLI (Beth, Sun Oct 12 12:29:22 2014 +1100)
-  * 3bdde98 - Removing unused files (Beth, Sun Oct 12 12:11:48 2014 +1100)
-  * ef95717 - Made it build (Beth, Sat Oct 11 13:24:35 2014 +1100)
-  * 1e78b62 - Removed pact-test.rake (Beth, Sat Oct 11 13:20:49 2014 +1100)
-  * 3389b5e - Initial commit (Beth, Sat Oct 11 13:13:23 2014 +1100)
+* e7080fe - Added a QueryString class in preparation for a QueryHash class (Beth, Sun Oct 12 14:32:15 2014 +1100)
+* 8839151 - Added Travis config (Beth, Sun Oct 12 12:31:44 2014 +1100)
+* 81ade54 - Removed CLI (Beth, Sun Oct 12 12:29:22 2014 +1100)
+* 3bdde98 - Removing unused files (Beth, Sun Oct 12 12:11:48 2014 +1100)
+* ef95717 - Made it build (Beth, Sat Oct 11 13:24:35 2014 +1100)
+* 1e78b62 - Removed pact-test.rake (Beth, Sat Oct 11 13:20:49 2014 +1100)
+* 3389b5e - Initial commit (Beth, Sat Oct 11 13:13:23 2014 +1100)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pact-support (0.0.3)
+    pact-support (0.0.4)
       awesome_print (~> 1.1)
       find_a_port (~> 1.0.1)
       json

data/lib/pact/configuration.rb

@@ -3,6 +3,7 @@ require 'pact/matchers/unix_diff_formatter'
 require 'pact/matchers/list_diff_formatter'
 require 'pact/shared/json_differ'
 require 'pact/shared/text_differ'
+require 'pact/shared/form_differ'
 
 
 module Pact
@@ -29,6 +30,7 @@ module Pact
 
     DIFFERS = [
       [/json/, Pact::JsonDiffer],
+      [/application\/x\-www\-form\-urlencoded/, Pact::FormDiffer],
       [NilMatcher, Pact::TextDiffer],
       [/.*/, Pact::TextDiffer]
     ]
@@ -95,6 +97,15 @@ module Pact
       log_dir + "/pact.log"
     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
+
     private
 
     def diff_formatter_for input

data/lib/pact/consumer_contract/request.rb

@@ -67,10 +67,10 @@ module Pact
 
       def body_diff(actual_body)
         if specified?(:body)
-          body_differ.call({:body => body}, {body: actual_body}, allow_unexpected_keys: runtime_options[:allow_unexpected_keys_in_body])
-        else
-          {}
+          body_difference = body_differ.call(body, actual_body, allow_unexpected_keys: runtime_options[:allow_unexpected_keys_in_body])
+          return { body: body_difference } if body_difference.any?
         end
+        {}
       end
 
       def body_differ

data/lib/pact/shared/form_differ.rb

@@ -0,0 +1,21 @@
+require 'pact/matchers/matchers'
+require 'uri'
+
+module Pact
+  class FormDiffer
+
+    extend Matchers
+
+    def self.call expected, actual, options = {}
+      diff to_hash(expected), to_hash(actual), options
+    end
+
+    def self.to_hash form_body
+      URI.decode_www_form(form_body).each_with_object({}) do | pair, hash |
+        hash[pair.first] ||= []
+        hash[pair.first] << pair.last
+      end
+    end
+
+  end
+end

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/lib/pact/configuration_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'pact/configuration'
+
+module Pact
+
+  describe Configuration do
+
+    subject { Configuration.default_configuration }
+
+    describe "#color_enabled" do
+
+      it "sets color_enabled to be true by default" do
+        expect(subject.color_enabled).to be true
+      end
+
+      it "allows configuration of colour_enabled" do
+        subject.color_enabled = false
+        expect(subject.color_enabled).to be false
+      end
+
+    end
+
+  end
+end

data/spec/lib/pact/shared/form_differ_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+require 'pact/shared/form_differ'
+require 'pact/matchers/difference'
+require 'pact/matchers/unix_diff_formatter'
+
+module Pact
+  describe FormDiffer do
+
+    describe ".call" do
+
+      let(:expected) { "param1=foo&param2=bar&param2=foobar" }
+      let(:actual)   { "param1=wiffle&param2=foobar&param2=bar" }
+
+      let(:difference) do
+        {
+          "param1" => [Pact::Matchers::Difference.new("foo", "wiffle")],
+          "param2" => [Pact::Matchers::Difference.new("bar", "foobar"), Pact::Matchers::Difference.new("foobar", "bar")]
+        }
+      end
+
+      subject { FormDiffer.call(expected, actual) }
+
+      context "when there is a diff" do
+        it "returns the diff" do
+          expect(subject).to eq difference
+        end
+      end
+
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -267,6 +267,7 @@ files:
 - lib/pact/rspec.rb
 - lib/pact/shared/active_support_support.rb
 - lib/pact/shared/dsl.rb
+- lib/pact/shared/form_differ.rb
 - lib/pact/shared/jruby_support.rb
 - lib/pact/shared/json_differ.rb
 - lib/pact/shared/key_not_found.rb
@@ -280,6 +281,7 @@ files:
 - lib/pact/term.rb
 - lib/tasks/pact.rake
 - pact-support.gemspec
+- spec/lib/pact/configuration_spec.rb
 - spec/lib/pact/consumer/request_spec.rb
 - spec/lib/pact/consumer_contract/active_support_support_spec.rb
 - spec/lib/pact/consumer_contract/consumer_contract_spec.rb
@@ -301,6 +303,7 @@ files:
 - spec/lib/pact/matchers/unix_diff_formatter_spec.rb
 - spec/lib/pact/reification_spec.rb
 - spec/lib/pact/shared/dsl_spec.rb
+- spec/lib/pact/shared/form_differ_spec.rb
 - spec/lib/pact/shared/json_differ_spec.rb
 - spec/lib/pact/shared/key_not_found_spec.rb
 - spec/lib/pact/shared/request_spec.rb
@@ -355,6 +358,7 @@ signing_key:
 specification_version: 4
 summary: Shared code for Pact gems
 test_files:
+- spec/lib/pact/configuration_spec.rb
 - spec/lib/pact/consumer/request_spec.rb
 - spec/lib/pact/consumer_contract/active_support_support_spec.rb
 - spec/lib/pact/consumer_contract/consumer_contract_spec.rb
@@ -376,6 +380,7 @@ test_files:
 - spec/lib/pact/matchers/unix_diff_formatter_spec.rb
 - spec/lib/pact/reification_spec.rb
 - spec/lib/pact/shared/dsl_spec.rb
+- spec/lib/pact/shared/form_differ_spec.rb
 - spec/lib/pact/shared/json_differ_spec.rb
 - spec/lib/pact/shared/key_not_found_spec.rb
 - spec/lib/pact/shared/request_spec.rb