pact-support 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4e0645299d4021d5e3a99a489a55fe172d75bba
-  data.tar.gz: 163cc87eb1e6b8b0860abaa96de08292625b69a0
+  metadata.gz: 8ea2875d5e2dc8777d847b774ec40a0d4afd539e
+  data.tar.gz: 425177cb326444b96ed9d24081e6d8f02daefec4
 SHA512:
-  metadata.gz: 27e82aa4e9d06ae561ec43c9694f1769c801c48e86c5b7936bebb32739587073b71ee7c85b60474c3fb49c95af4c70bfe9aec0696cf90561cd0bec0691153a43
-  data.tar.gz: 2cf0ceee17aa95868b8b2298194fd766b2ef3e2b5242a319869bb14586c1d36ab282b3c9bb43de757946a87db33828622c6e9ac627f6c0c1ce6faad46ebc90aa
+  metadata.gz: ce82242279a886e133d667a06e2202a81e009e8a4bd3c5c2f2a904f849421af09ec7a1159be83370806b247e7fda0404efe0568121c294cd74dfb068e9137085
+  data.tar.gz: 0efae033f755ab785ec05e91a3acf8e9b732991374115ea879bebf4f75ea27bec34655914ec2756d0ebe6fd68a2fdedc5affc9acba1a656a916ca91e62d638c1

data/CHANGELOG.md

@@ -2,6 +2,9 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)'
 
+### 1.1.5 (1 Aug 2017)
+* 81bc967 - fix(match type rules): Allow match: 'type' to be specified on the parent element of the array. Closes: #35, https://github.com/pact-foundation/pact-provider-verifier/issues/8 (Beth Skurrie, Tue Aug 1 10:33:02 2017 +1000)
+
 ### 1.1.4 (31 July 2017)
 * 425881c - fix(cirular dependency for UnixDiffFormatter): Fixes circular dependency between pact/configuration and pact/matchers/unix_diff_formatter (Beth Skurrie, Mon Jul 31 11:45:44 2017 +1000)
 

data/lib/pact/matching_rules/merge.rb

@@ -46,12 +46,13 @@ module Pact
       end
 
       def recurse_array array, path
-        array_like_path = "#{path}[*]*"
-        array_match_type = @matching_rules[array_like_path] && @matching_rules[array_like_path]['match']
+        array_like_children_path = "#{path}[*]*"
+        parent_match_rule = @matching_rules[path] && @matching_rules[path]['match']
+        children_match_rule = @matching_rules[array_like_children_path] && @matching_rules[array_like_children_path]['match']
+        min = @matching_rules[path] && @matching_rules[path]['min']
 
-        if array_match_type == 'type'
+        if min && (children_match_rule == 'type' || (children_match_rule.nil? && parent_match_rule == 'type'))
           warn_when_not_one_example_item(array, path)
-          min = @matching_rules[path]['min']
           # log_ignored_rules(path, @matching_rules[path], {'min' => min})
           Pact::ArrayLike.new(recurse(array.first, "#{path}[*]"), min: min)
         else
@@ -75,7 +76,7 @@ module Pact
         array_rules = @matching_rules["#{path}[*]*"]
         return object unless rules || array_rules
 
-        if rules['match'] == 'type'
+        if rules['match'] == 'type' && !rules.has_key?('min')
           handle_match_type(object, path, rules)
         elsif rules['regex']
           handle_regex(object, path, rules)

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "1.1.4"
+    VERSION = "1.1.5"
   end
 end

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

@@ -104,11 +104,13 @@ module Pact
               "$.body._links.self.href" => { "regex" => "http:\\/\\/.*\\/thing", "match" => "regex", "ignored" => "somerule" }
             }
           end
+
           it "creates a Pact::Term at the appropriate path" do
             expect(subject["_links"]["self"]["href"]).to be_instance_of(Pact::Term)
             expect(subject["_links"]["self"]["href"].generate).to eq "http://localhost:1234/thing"
             expect(subject["_links"]["self"]["href"].matcher.inspect).to eq "/http:\\/\\/.*\\/thing/"
           end
+
           it "it logs the rules it has ignored" do
             expect($stderr).to receive(:puts) do | message |
               expect(message).to match /ignored.*"somerule"/
@@ -136,6 +138,7 @@ module Pact
               "$.body._links.self[0].href" => { "regex" => "http:\\/\\/.*\\/thing" }
             }
           end
+
           it "creates a Pact::Term at the appropriate path" do
             expect(subject["_links"]["self"][0]["href"]).to be_instance_of(Pact::Term)
             expect(subject["_links"]["self"][0]["href"].generate).to eq "http://localhost:1234/thing"
@@ -143,14 +146,29 @@ module Pact
           end
         end
 
-        describe "with an array where all elements should match by type" do
+        describe "with an array where all elements should match by type and the rule is specified on the parent element and there is no min specified" do
           let(:expected) do
             {
+              'alligators' => [{'name' => 'Mary'}]
+            }
+          end
 
-              'alligators' => [
-                {'name' => 'Mary'}
-              ]
+          let(:matching_rules) do
+            {
+              "$.body.alligators" => { 'match' => 'type' }
+            }
+          end
+
+          it "creates a Pact::SomethingLike at the appropriate path" do
+            expect(subject["alligators"]).to be_instance_of(Pact::SomethingLike)
+            expect(subject["alligators"].contents).to eq ['name' => 'Mary']
+          end
+        end
 
+        describe "with an array where all elements should match by type and the rule is specified on the child elements" do
+          let(:expected) do
+            {
+              'alligators' => [{'name' => 'Mary'}]
             }
           end
 
@@ -167,6 +185,47 @@ module Pact
           end
         end
 
+        describe "with an array where all elements should match by type and the rule is specified on both the parent element and the child elements" do
+          let(:expected) do
+            {
+              'alligators' => [{'name' => 'Mary'}]
+            }
+          end
+
+          let(:matching_rules) do
+            {
+              "$.body.alligators" => { 'min' => 2, 'match' => 'type' },
+              "$.body.alligators[*].*" => { 'match' => 'type'}
+            }
+          end
+
+          it "creates a Pact::ArrayLike at the appropriate path" do
+            expect(subject["alligators"]).to be_instance_of(Pact::ArrayLike)
+            expect(subject["alligators"].contents).to eq 'name' => 'Mary'
+            expect(subject["alligators"].min).to eq 2
+          end
+        end
+
+        describe "with an array where all elements should match by type and there is only a match:type on the parent element" do
+          let(:expected) do
+            {
+              'alligators' => [{'name' => 'Mary'}]
+            }
+          end
+
+          let(:matching_rules) do
+            {
+              "$.body.alligators" => { 'min' => 2, 'match' => 'type' },
+            }
+          end
+
+          it "creates a Pact::ArrayLike at the appropriate path" do
+            expect(subject["alligators"]).to be_instance_of(Pact::ArrayLike)
+            expect(subject["alligators"].contents).to eq 'name' => 'Mary'
+            expect(subject["alligators"].min).to eq 2
+          end
+        end
+
         describe "with an array where all elements should match by type nested inside another array where all elements should match by type" do
           let(:expected) do
             {
@@ -191,6 +250,7 @@ module Pact
               "$.body.alligators[*].children[*].*" => { 'match' => 'type'}
             }
           end
+
           it "creates a Pact::ArrayLike at the appropriate path" do
             expect(subject["alligators"].contents['children']).to be_instance_of(Pact::ArrayLike)
             expect(subject["alligators"].contents['children'].contents).to eq 'age' => 9

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp