pact-support 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7052ae315f37af6ae3f7ea9d1996f8cbb12ea7d0
-  data.tar.gz: 648fff2d0659c82cca19046f1c5440f86e9cf2ab
+  metadata.gz: add17cb769a9dad8275e79e1320049e8134bfc0a
+  data.tar.gz: 92d453de103d3ee753736b80c0de57f4323b0725
 SHA512:
-  metadata.gz: 9c2f5d2b7f6c792582eeaf03a70446aff2c3d67395a4b6448c11fbd6a38e9fbb6538f0b206b1cf297b923cbc7c0d977854160d412f6e0b540f36bae250f8e420
-  data.tar.gz: 516d17b3b6c5b8590b264d934334dcdd6c8360e19a9581390f8e6353f17407ca098d63bedf35f213615e1076214d743eb03196063e7166fe56bb781698af1a77
+  metadata.gz: 4c8c8ccfc4a3a9884b600ac349ffbdb5eee0934867cedf32ae5f6a62919d573d6a383dae9ee675d471b425d6591bc1a0a07b2b1bee1729027ff5a8100963c14f
+  data.tar.gz: c81c6c65b68b03cb5867e0fc94bf6df9fd849a881fc9936b14c13ec73fea4d1d967e7fdb73b2b5e77208dbe04d0e1a9cfdfffe17f08d80a04b1706e67ba74fd4

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="v1.6.3"></a>
+### v1.6.3 (2018-07-12)
+
+
+#### Bug Fixes
+
+* remove incorrect warning about ignoring unsupported matching rules for min => x	 ([50d5f6d](/../../commit/50d5f6d))
+* serialize ArrayLike in query params without wrapping another array around it	 ([b4a9ec7](/../../commit/b4a9ec7))
+
+
 <a name="v1.6.2"></a>
 ### v1.6.2 (2018-05-31)
 

data/lib/pact/consumer_contract/query_hash.rb

@@ -56,6 +56,8 @@ module Pact
     def insert(hash, k, v)
       if Hash === v
         v.each {|k2, v2| insert(hash, :"#{k}[#{k2}]", v2) }
+      elsif Pact::ArrayLike === v
+        hash[k.to_sym] = v
       else
         hash[k.to_sym] = [*v]
       end

data/lib/pact/matching_rules/merge.rb

@@ -13,11 +13,12 @@ module Pact
         @expected = expected
         @matching_rules = standardise_paths(matching_rules)
         @root_path = JsonPath.new(root_path).to_s
+        @used_rules = []
       end
 
       def call
         return @expected if @matching_rules.nil? || @matching_rules.empty?
-        recurse @expected, @root_path
+        recurse(@expected, @root_path).tap { log_ignored_rules }
       end
 
       private
@@ -46,14 +47,18 @@ module Pact
       end
 
       def recurse_array array, path
+        parent_match_rule = find_rule(path, 'match')
+        log_used_rule(path, 'match', parent_match_rule) if parent_match_rule
+
         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']
+        children_match_rule = find_rule(array_like_children_path, 'match')
+        log_used_rule(array_like_children_path, 'match', children_match_rule) if children_match_rule
+
+        min = find_rule(path, 'min')
+        log_used_rule(path, 'min', min) if min
 
         if min && (children_match_rule == 'type' || (children_match_rule.nil? && parent_match_rule == 'type'))
           warn_when_not_one_example_item(array, path)
-          # log_ignored_rules(path, @matching_rules[path], {'min' => min})
           Pact::ArrayLike.new(recurse(array.first, "#{path}[*]"), min: min)
         else
           new_array = []
@@ -81,30 +86,41 @@ module Pact
         elsif rules['regex']
           handle_regex(object, path, rules)
         else
-          log_ignored_rules(path, rules, {})
           object
         end
       end
 
       def handle_match_type object, path, rules
-        log_ignored_rules(path, rules, {'match' => 'type'})
+        log_used_rule(path, 'match', 'type')
         Pact::SomethingLike.new(object)
       end
 
       def handle_regex object, path, rules
-        log_ignored_rules(path, rules, {'match' => 'regex', 'regex' => rules['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']))
       end
 
-      def log_ignored_rules path, rules, used_rules
-        dup_rules = rules.dup
-        used_rules.each_pair do | used_key, used_value |
-          dup_rules.delete(used_key) if dup_rules[used_key] == used_value
+      def log_ignored_rules
+        dup_rules = @matching_rules.dup
+        @used_rules.each do | (path, key, value) |
+          dup_rules[path].delete(key) if dup_rules[path][key] == value
         end
+
         if dup_rules.any?
-          $stderr.puts "WARN: Ignoring unsupported matching rules #{dup_rules} for path #{path}"
+          dup_rules.each do | path, rules |
+            $stderr.puts "WARN: Ignoring unsupported matching rules #{rules} for path #{path}" if rules.any?
+          end
         end
       end
+
+      def find_rule(path, key)
+        @matching_rules[path] && @matching_rules[path][key]
+      end
+
+      def log_used_rule path, key, value
+        @used_rules << [path, key, value]
+      end
     end
   end
 end

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "1.6.2"
+    VERSION = "1.6.3"
   end
 end

data/spec/lib/pact/consumer_contract/query_hash_spec.rb

@@ -82,6 +82,20 @@ module Pact
     end
 
     describe "#to_json" do
+      context "when the query contains an ArrayLike" do
+        let(:query) { { foo: Pact.each_like("1"), bar: "2" } }
+        let(:expected_json) do
+          {
+            foo: Pact.each_like("1"),
+            bar: ["2"]
+          }.to_json
+        end
+
+        it "serialises the ArrayLike without wrapping an array around it" do
+          expect(subject.to_json).to eq expected_json
+        end
+      end
+
       context "when the query contains a Pact::Term" do
         let(:term) { Pact::Term.new(generate: "thing", matcher: /th/) }
         let(:query) { { param: term } }

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

@@ -7,10 +7,16 @@ module Pact
       subject { Merge.(expected, matching_rules, "$.body") }
 
       before do
-        allow($stderr).to receive(:puts)
+        allow($stderr).to receive(:puts) do | message |
+          raise "Was not expecting stderr to receive #{message.inspect} in this spec. This may be because of a missed call to log_used_rule in Merge."
+        end
       end
 
       describe "no recognised rules" do
+        before do
+          allow($stderr).to receive(:puts)
+        end
+
         let(:expected) do
           {
             "_links" => {
@@ -63,6 +69,10 @@ module Pact
       end
 
       describe "type based matching" do
+        before do
+          allow($stderr).to receive(:puts)
+        end
+
         let(:expected) do
           {
             "name" => "Mary"
@@ -89,6 +99,10 @@ module Pact
       describe "regular expressions" do
 
         describe "in a hash" do
+          before do
+            allow($stderr).to receive(:puts)
+          end
+
           let(:expected) do
             {
               "_links" => {
@@ -178,6 +192,7 @@ module Pact
               "$.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'
@@ -259,6 +274,10 @@ module Pact
         end
 
         describe "with an example array with more than one item" do
+          before do
+            allow(Pact.configuration.error_stream).to receive(:puts)
+          end
+
           let(:expected) do
             {
 
@@ -277,13 +296,7 @@ module Pact
             }
           end
 
-          xit "doesn't warn about the min size being ignored" do
-            expect(Pact.configuration.error_stream).to receive(:puts).once
-            subject
-          end
-
           it "warns that the other items will be ignored" do
-            allow(Pact.configuration.error_stream).to receive(:puts)
             expect(Pact.configuration.error_stream).to receive(:puts).with(/WARN: Only the first item/)
             subject
           end

metadata

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