pact-support 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bbba1bbc7c4a2bf0c9bf83c335bca49f3911b33
-  data.tar.gz: 074b3a5fbf4ea09514e9a58d6af2d42d22739942
+  metadata.gz: fc9f8683f2295ada09a03f4726ac8c8532d2def6
+  data.tar.gz: c5796a44f6c28c2070cb37e1ae8d6341e2118463
 SHA512:
-  metadata.gz: d15ba35784d2b6a93feeae4f77fd43f32ae2b07d3ece6b1b1a0367d9d05702a6a6dca9696e65287ba782c2ccfc495fc7fb3c8e8a34c57f525ddaf0702acdf6b2
-  data.tar.gz: 58ebf78d2b351442c2d3ac0ce8a2874949939acb51ca94b5aa7f0b261b1674da0ddd73db983e643267e9dd3b8c0117a80277090ac36690ff71ece9fbb694c118
+  metadata.gz: fb794ca126e1566123ab1c7333fb32d3e66851aed50b7f2489b6979380baf802e09cda256fa2806ebffeba3a93371e5627029aa6d515c6e4912b125e457758a8
+  data.tar.gz: 862c5fc5b00ddc050e22337565acbae72a72bcd9845767dffed811aca2cdbeb79b124d3a681d40ab0b5fdf6cdec6705970694c6794aac6b7189880a2bef2ac61

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+<a name="v1.7.1"></a>
+### v1.7.1 (2018-08-09)
+
+
+#### Bug Fixes
+
+* remove incorrect warning messages about matching rules being ignored	 ([30328e0](/../../commit/30328e0))
+
+
 <a name="v1.7.0"></a>
 ### v1.7.0 (2018-08-07)
 

data/lib/pact/matching_rules/merge.rb

@@ -31,18 +31,20 @@ module Pact
       end
 
       def recurse expected, path
-        case expected
+        recursed = case expected
         when Hash then recurse_hash(expected, path)
         when Array then recurse_array(expected, path)
         else
           expected
         end
+
+        wrap(recursed, path)
       end
 
       def recurse_hash hash, path
-        hash.each_with_object({}) do | (k, v), new_hash |
+        recursed =  hash.each_with_object({}) do | (k, v), new_hash |
           new_path = path + "['#{k}']"
-          new_hash[k] = recurse(wrap(v, new_path), new_path)
+          new_hash[k] = recurse(v, new_path)
         end
       end
 
@@ -64,7 +66,7 @@ module Pact
           new_array = []
           array.each_with_index do | item, index |
             new_path = path + "[#{index}]"
-            new_array << recurse(wrap(item, new_path), new_path)
+            new_array << recurse(item, new_path)
           end
           new_array
         end
@@ -77,28 +79,25 @@ module Pact
       end
 
       def wrap object, path
-        rules = @matching_rules[path]
-        array_rules = @matching_rules["#{path}[*]*"]
-        return object unless rules || array_rules
-
-        if rules['match'] == 'type' && !rules.has_key?('min')
-          handle_match_type(object, path, rules)
-        elsif rules['regex']
-          handle_regex(object, path, rules)
+        if find_rule(path, 'match') == 'type' && !find_rule(path, 'min')
+          handle_match_type(object, path)
+        elsif find_rule(path, 'regex')
+          handle_regex(object, path)
         else
           object
         end
       end
 
-      def handle_match_type object, path, rules
+      def handle_match_type object, path
         log_used_rule(path, 'match', 'type')
-        Pact::SomethingLike.new(recurse(object, path))
+        Pact::SomethingLike.new(object)
       end
 
-      def handle_regex object, path, rules
+      def handle_regex object, path
+        regex = find_rule(path, 'regex')
         log_used_rule(path, 'match', 'regex') # assumed to be present
-        log_used_rule(path, 'regex', rules['regex'])
-        Pact::Term.new(generate: object, matcher: Regexp.new(rules['regex']))
+        log_used_rule(path, 'regex', regex)
+        Pact::Term.new(generate: object, matcher: Regexp.new(regex))
       end
 
       def log_ignored_rules

data/lib/pact/support/version.rb

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

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

@@ -70,7 +70,7 @@ module Pact
 
       describe "type based matching" do
         before do
-          allow($stderr).to receive(:puts)
+          allow($stderr).to receive(:puts).and_call_original
         end
 
         let(:expected) do
@@ -90,7 +90,7 @@ module Pact
         end
 
         it "it logs the rules it has ignored" do
-          expect($stderr).to receive(:puts).with(/ignored.*matchingrule/)
+          expect($stderr).to receive(:puts).once.with(/ignored.*matchingrule/)
           subject
         end
 
@@ -356,6 +356,61 @@ module Pact
           expect(subject['@name']).to be_instance_of(Pact::SomethingLike)
         end
       end
+
+      describe "when a Pact.like is nested inside a Pact.each_like which is nested inside a Pact.like" do
+        let(:original_definition) do
+          Pact.like('foos' => Pact.each_like(Pact.like('name' => "foo1")))
+        end
+
+        let(:expected) do
+          Pact::Reification.from_term(original_definition)
+        end
+
+        let(:matching_rules) do
+          Extract.call(body: original_definition)
+        end
+
+        it "creates a Pact::SomethingLike containing a Pact::ArrayLike containing a Pact::SomethingLike" do
+          expect(subject.to_hash).to eq original_definition.to_hash
+        end
+      end
+
+      describe "when a Pact.array_like is the top level object" do
+        let(:original_definition) do
+          Pact.each_like('foos')
+        end
+
+        let(:expected) do
+          Pact::Reification.from_term(original_definition)
+        end
+
+        let(:matching_rules) do
+          Extract.call(body: original_definition)
+        end
+
+        it "creates a Pact::ArrayLike" do
+          expect(subject.to_hash).to eq original_definition.to_hash
+        end
+      end
+
+      describe "when a Pact.like containing an array is the top level object" do
+        let(:original_definition) do
+          Pact.like(['foos'])
+        end
+
+        let(:expected) do
+          Pact::Reification.from_term(original_definition)
+        end
+
+        let(:matching_rules) do
+          Extract.call(body: original_definition)
+        end
+
+        it "creates a Pact::SomethingLike" do
+          expect(subject).to be_a(Pact::SomethingLike)
+          expect(subject.to_hash).to eq original_definition.to_hash
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-06 00:00:00.000000000 Z
+date: 2018-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp