pact-support 1.6.6 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '039bcfb7e385f534c0944984d075e419376bbfbf'
-  data.tar.gz: 84b10dc7ddd4ccd6d266bc2f9b7d19a605a30a33
+  metadata.gz: 2bbba1bbc7c4a2bf0c9bf83c335bca49f3911b33
+  data.tar.gz: 074b3a5fbf4ea09514e9a58d6af2d42d22739942
 SHA512:
-  metadata.gz: 70d1593f05cedc8a458fd33e9b4a607d43ac63dbb54c05312472e79c39f908f0b005facc50b68e9451ac0bd6638b9be258f91de490e32d2c1bdda209cc666e46
-  data.tar.gz: a6340f39c1da805ca5512551938dea1de7a1e7505196cb7ad455fa44ca1aebcf0ab981a53740974c127d10f3c1965db0a2f76a0bb331bf759785eddd638eb50e
+  metadata.gz: d15ba35784d2b6a93feeae4f77fd43f32ae2b07d3ece6b1b1a0367d9d05702a6a6dca9696e65287ba782c2ccfc495fc7fb3c8e8a34c57f525ddaf0702acdf6b2
+  data.tar.gz: 58ebf78d2b351442c2d3ac0ce8a2874949939acb51ca94b5aa7f0b261b1674da0ddd73db983e643267e9dd3b8c0117a80277090ac36690ff71ece9fbb694c118

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+<a name="v1.7.0"></a>
+### v1.7.0 (2018-08-07)
+
+
+#### Features
+
+* add support for multipart/form	 ([8ed4332](/../../commit/8ed4332))
+
+
 <a name="v1.6.6"></a>
 ### v1.6.6 (2018-07-25)
 

data/lib/pact/configuration.rb

@@ -1,9 +1,11 @@
 require 'pact/matchers/embedded_diff_formatter'
 require 'pact/matchers/unix_diff_formatter'
 require 'pact/matchers/list_diff_formatter'
+require 'pact/matchers/multipart_form_diff_formatter'
 require 'pact/shared/json_differ'
 require 'pact/shared/text_differ'
 require 'pact/shared/form_differ'
+require 'pact/shared/multipart_form_differ'
 
 
 module Pact
@@ -24,6 +26,7 @@ module Pact
     end
 
     DIFF_FORMATTER_REGISTRATIONS = [
+      [/multipart\/form-data/, Pact::Matchers::MultipartFormDiffFormatter],
       [/.*/, Pact::Matchers::UnixDiffFormatter],
       [NilMatcher, Pact::Matchers::UnixDiffFormatter]
     ]
@@ -31,6 +34,7 @@ module Pact
     DIFFERS = [
       [/json/, Pact::JsonDiffer],
       [/application\/x\-www\-form\-urlencoded/, Pact::FormDiffer],
+      [/multipart\/form-data/, Pact::MultipartFormDiffer],
       [NilMatcher, Pact::TextDiffer],
       [/.*/, Pact::TextDiffer]
     ]

data/lib/pact/consumer_contract/request.rb

@@ -2,9 +2,7 @@ require 'pact/shared/request'
 require 'pact/shared/null_expectation'
 
 module Pact
-
   module Request
-
     class Expected < Pact::Request::Base
 
       DEFAULT_OPTIONS = {:allow_unexpected_keys => false}.freeze
@@ -80,8 +78,6 @@ module Pact
       def body_differ
         Pact.configuration.body_differ_for_content_type content_type
       end
-
     end
-
   end
-end
+end

data/lib/pact/matchers/multipart_form_diff_formatter.rb

@@ -0,0 +1,41 @@
+require 'pact/matchers/unix_diff_formatter'
+require 'pact/matchers/differ'
+
+module Pact
+  module Matchers
+    class MultipartFormDiffFormatter
+
+      def initialize diff, options = {}
+        @options = options
+        @body_diff = diff[:body]
+        @non_body_diff = diff.reject{ |k, v| k == :body }
+        @colour = options.fetch(:colour, false)
+        @differ = Pact::Matchers::Differ.new(@colour)
+      end
+
+      def self.call diff, options = {}
+        new(diff, options).call
+      end
+
+      def call
+        Pact::Matchers::UnixDiffFormatter::MESSAGES_TITLE + "\n" + non_body_diff_string + "\n" + body_diff_string
+      end
+
+      def non_body_diff_string
+        if @non_body_diff.any?
+          Pact::Matchers::ExtractDiffMessages.call(@non_body_diff).collect{ | message| "* #{message}" }.join("\n")
+        else
+          ""
+        end
+      end
+
+      def body_diff_string
+        if @body_diff
+          @differ.diff_as_string(@body_diff.expected, @body_diff.actual)
+        else
+          ""
+        end
+      end
+    end
+  end
+end

data/lib/pact/shared/multipart_form_differ.rb

@@ -0,0 +1,14 @@
+require 'uri'
+require 'pact/shared/text_differ'
+
+module Pact
+  class MultipartFormDiffer
+    def self.call expected, actual, options = {}
+      require 'pact/matchers' # avoid recursive loop between this file and pact/matchers
+      expected_boundary = expected.split.first
+      actual_boundary = actual.split.first
+      actual_with_hardcoded_boundary = actual.gsub(actual_boundary, expected_boundary)
+      TextDiffer.call(expected, actual_with_hardcoded_boundary, options)
+    end
+  end
+end

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "1.6.6"
+    VERSION = "1.7.0"
   end
 end

data/spec/fixtures/multipart-form-diff.txt

@@ -0,0 +1,9 @@
+
+
+Description of differences
+--------------------------------------
+* Wrong header
+
+@@ -1,2 +1,2 @@
+-bar
++foo

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

@@ -0,0 +1,36 @@
+require 'pact/matchers/multipart_form_diff_formatter'
+
+module Pact
+  module Matchers
+    describe MultipartFormDiffFormatter do
+      describe ".call" do
+        subject { MultipartFormDiffFormatter.call(diff, options)}
+
+        let(:diff) do
+          {
+            headers: header_diff,
+            body: body_diff
+          }
+        end
+
+        let(:header_diff) do
+          {
+            "Content-Type" => Difference.new("foo", "bar", "Wrong header")
+          }
+        end
+
+        let(:body_diff) do
+          Difference.new("foo", "bar", "A message")
+        end
+
+        let(:options) { {} }
+
+        let(:expected_output) { File.read("spec/fixtures/multipart-form-diff.txt")}
+
+        it "formats the diff" do
+          expect(subject).to eq expected_output
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+require 'pact/shared/multipart_form_differ'
+
+module Pact
+  describe MultipartFormDiffer do
+
+    describe ".call" do
+
+      let(:expected_body) do
+        "-------------RubyMultipartPost-1e4912957c7bb64de3c444568326663b\r\nContent-Disposition: form-data; name=\"file\"; filename=\"text.txt\"\r\nContent-Length: 14\r\nContent-Type: text/plain\r\nContent-Transfer-Encoding: binary\r\n\r\nThis is a file\r\n-------------RubyMultipartPost-1e4912957c7bb64de3c444568326663b--\r\n\r\n"
+      end
+
+      let(:actual_body) do
+        "-------------RubyMultipartPost-1e4912957c7bb64de3c4445683266XXX\r\nContent-Disposition: form-data; name=\"file\"; filename=\"text.txt\"\r\nContent-Length: 14\r\nContent-Type: text/plain\r\nContent-Transfer-Encoding: binary\r\n\r\nThis is a file\r\n-------------RubyMultipartPost-1e4912957c7bb64de3c4445683266XXX--\r\n\r\n"
+      end
+
+      let(:options) do
+        {}
+      end
+
+      subject { MultipartFormDiffer.call(expected_body, actual_body, options) }
+
+      context "when the bodies are the same apart from the boundary" do
+        it "returns an empty diff" do
+          expect(subject).to eq({})
+        end
+      end
+
+      context "when the bodies are not the same" do
+        let(:actual_body) do
+          "-------------RubyMultipartPost-1e4912957c7bb64de3c4445683266XXX\r\nContent-Disposition: form-data; name=\"file\"; filename=\"bar.txt\"\r\nContent-Length: 14\r\nContent-Type: text/plain\r\nContent-Transfer-Encoding: binary\r\n\r\nThis is a file\r\n-------------RubyMultipartPost-1e4912957c7bb64de3c4445683266XXX--\r\n\r\n"
+        end
+
+        it "returns a text diff" do
+          expect(subject).to_not eq({})
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.7.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-25 00:00:00.000000000 Z
+date: 2018-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -297,6 +297,7 @@ files:
 - lib/pact/matchers/index_not_found.rb
 - lib/pact/matchers/list_diff_formatter.rb
 - lib/pact/matchers/matchers.rb
+- lib/pact/matchers/multipart_form_diff_formatter.rb
 - lib/pact/matchers/no_diff_at_index.rb
 - lib/pact/matchers/regexp_difference.rb
 - lib/pact/matchers/type_difference.rb
@@ -317,6 +318,7 @@ files:
 - lib/pact/shared/jruby_support.rb
 - lib/pact/shared/json_differ.rb
 - lib/pact/shared/key_not_found.rb
+- lib/pact/shared/multipart_form_differ.rb
 - lib/pact/shared/null_expectation.rb
 - lib/pact/shared/request.rb
 - lib/pact/shared/text_differ.rb
@@ -331,6 +333,7 @@ files:
 - script/release.sh
 - script/update-pact-specification-v2
 - spec/fixtures/interaction-with-matching-rules.json
+- spec/fixtures/multipart-form-diff.txt
 - spec/fixtures/not-a-pact.json
 - spec/fixtures/pact-http-v2.json
 - spec/fixtures/pact-http-v3.json
@@ -362,6 +365,7 @@ files:
 - spec/lib/pact/matchers/matchers_messages_mismatched_value_spec.rb
 - spec/lib/pact/matchers/matchers_messages_regexp_spec.rb
 - spec/lib/pact/matchers/matchers_spec.rb
+- spec/lib/pact/matchers/multipart_form_diff_formatter_spec.rb
 - spec/lib/pact/matchers/no_diff_at_index_spec.rb
 - spec/lib/pact/matchers/regexp_difference_spec.rb
 - spec/lib/pact/matchers/type_difference_spec.rb
@@ -378,6 +382,7 @@ files:
 - 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/multipart_form_differ_spec.rb
 - spec/lib/pact/shared/request_spec.rb
 - spec/lib/pact/shared/text_differ_spec.rb
 - spec/lib/pact/something_like_spec.rb
@@ -436,6 +441,7 @@ specification_version: 4
 summary: Shared code for Pact gems
 test_files:
 - spec/fixtures/interaction-with-matching-rules.json
+- spec/fixtures/multipart-form-diff.txt
 - spec/fixtures/not-a-pact.json
 - spec/fixtures/pact-http-v2.json
 - spec/fixtures/pact-http-v3.json
@@ -467,6 +473,7 @@ test_files:
 - spec/lib/pact/matchers/matchers_messages_mismatched_value_spec.rb
 - spec/lib/pact/matchers/matchers_messages_regexp_spec.rb
 - spec/lib/pact/matchers/matchers_spec.rb
+- spec/lib/pact/matchers/multipart_form_diff_formatter_spec.rb
 - spec/lib/pact/matchers/no_diff_at_index_spec.rb
 - spec/lib/pact/matchers/regexp_difference_spec.rb
 - spec/lib/pact/matchers/type_difference_spec.rb
@@ -483,6 +490,7 @@ test_files:
 - 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/multipart_form_differ_spec.rb
 - spec/lib/pact/shared/request_spec.rb
 - spec/lib/pact/shared/text_differ_spec.rb
 - spec/lib/pact/something_like_spec.rb