pact-support 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e798766a40ccdcb43c8aed0bfbb4ee222c266db
-  data.tar.gz: fb9ab7ab4bac90b552b8c993ff582f035b5a9e00
+  metadata.gz: 20803ab69ce7de1114071b9920664f7f48824c66
+  data.tar.gz: 290ea395354b4122de84a607f684919b99a91ff0
 SHA512:
-  metadata.gz: 3d0363e0c4f19d960c4301cb96918d0eed195bd149eef1f4ce0ea4707c7629abf24a7c496e1918fb73f7b806bfea730e5a28397b972ea69a947e332bd2cd7cff
-  data.tar.gz: 0ec07b703a4abe989d0507d2f91f0aa96a76b16142e2115abca1ca355d1b0e4333e733c9d0f9142c33674116995a907ca58781d0b07ba970625253a4eebe1df6
+  metadata.gz: 908d1db1d4356dbe878d2373c7092c1ed007482a490a199c5fb7045d02dcc57775e1378627714e1e7e07310e3419551194af9816eb291080ea778362b978e89a
+  data.tar.gz: 5dab25c5ec872af637559ea7ac255b9614c4b630963bf0ac9698a089d0771cdf19f5c164c351944835f8c4fa759cb4335064af5737f8733d660c3b2cb2266a50

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+<a name="v1.8.1"></a>
+### v1.8.1 (2018-11-15)
+
+
+#### Bug Fixes
+
+* correctly handle ignored 'combine' rule	 ([cd52108](/../../commit/cd52108))
+
+
 <a name="v1.8.0"></a>
 ### v1.8.0 (2018-10-01)
 

data/lib/pact/matching_rules/v3/merge.rb

@@ -116,7 +116,7 @@ module Pact
           if @matching_rules.any?
             @matching_rules.each do | path, rules_hash |
               rules_hash.each do | key, value |
-                $stderr.puts "WARN: Ignoring unsupported #{key} #{value} for path #{path}" if value.any?
+                $stderr.puts "WARN: Ignoring unsupported #{key} #{value} for path #{path}" if value_present?(value)
               end
             end
           end
@@ -129,6 +129,10 @@ module Pact
         def log_used_rule path, key, value
           @used_rules << [path, key, value]
         end
+
+        def value_present? value
+          value.respond_to?(:any?) ? value.any? : true
+        end
       end
     end
   end

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "1.8.0"
+    VERSION = "1.8.1"
   end
 end

data/spec/lib/pact/matching_rules/v3/merge_spec.rb

@@ -456,6 +456,29 @@ module Pact
           end
         end
 
+        describe "with a combine key" do
+          let(:expected) do
+            {
+              "foo" => "bar"
+            }
+          end
+
+          let(:matching_rules) do
+            {
+              "$.foo" => {
+                "matchers" => [{ "match" => "type" }],
+                "combine" => "AND"
+              }
+            }
+
+          end
+
+          it "logs the ignored rule" do
+            allow(Pact.configuration.error_stream).to receive(:puts)
+            expect(Pact.configuration.error_stream).to receive(:puts).with("WARN: Ignoring unsupported combine AND for path $['foo']")
+            subject
+          end
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp