pact-support 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65b471492f7129b35b4d6c22ea34734b4236a064
-  data.tar.gz: 731b9b98c849c17d19fae3efd98eec69bc953a0d
+  metadata.gz: 8302de9af32aa569443e49a502132233ecc0fbc6
+  data.tar.gz: d03296b6197757a59b1a8c197b375fb17e3be7d7
 SHA512:
-  metadata.gz: 1a12e8a8345b77b732d66b356ff84d3ccb459011d40dbea405783b0c8aded30757615db3259fa97c226e44e58ce4a5402df8529d02abbbf92cae647b575bbd58
-  data.tar.gz: a92b1568e2e590d163967b103617483d7510ec4cab06c033aa79ec5694bb906cca02441ed71d68b877bf28aea76a7d9e0a9a627f7916f630dd249d1eb704b0af
+  metadata.gz: db57a82df74f57807f6514abad63b30374ebbb81d6aadac107059e9dbef23978d2e94ef2b6a5c30095d5b870a464aea05269bea1ffa96aa030305a2d595c546a
+  data.tar.gz: 9918d2bd33d4986bfcf67e41ed2a52d1d216bff694df1035f666cef2a933fbaaef37e8d5f82b9d34c3f80b5fab3a6c6434db6e06c15fc01a982bac5bf6f435da

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.1
-  - jruby-19mode
-  - jruby-1.7.11
-  - jruby-1.7.12
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
+  - jruby-9.0.5.0

data/CHANGELOG.md

@@ -1,6 +1,25 @@
 Do this to generate your change history
 
-  git log --pretty=format:'  * %h - %s (%an, %ad)'
+  git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
+
+
+### 0.5.5 (4 November 2015)
+* e9aaff0 - Merge pull request #21 from TakatoshiMaeda/reify_support_nested_something_like (Sergei Matheson, Fri Apr 29 09:54:00 2016 +1000)
+* eb9aa26 - Supporting nested Pact::SomethingLike reification (Takatoshi Maeda, Thu Apr 28 02:04:58 2016 +0900)
+* 832790d - Merge pull request #20 from taiki45/dsl-without-block (Sergei Matheson, Thu Mar 24 09:36:22 2016 +1100)
+* 9e924c8 - Object supporting DSL can be built without block (Taiki Ono, Wed Mar 23 16:38:27 2016 +0900)
+* 57aa993 - Merge pull request #18 from taiki45/escape-query-string-component (Sergei Matheson, Tue Mar 15 09:24:36 2016 +1100)
+* 2b0e7b4 - Escape query string components (Taiki Ono, Mon Mar 14 15:22:29 2016 +0900)
+* a383368 - Fix indent (Taiki Ono, Mon Mar 14 15:18:26 2016 +0900)
+* fae9a14 - Merge pull request #17 from taiki45/upgrade-jruby (Ronald Holshausen, Mon Mar 14 09:56:16 2016 +1100)
+* dc54092 - Support latest jruby and drop supporting jruby 1.7 (Taiki Ono, Sun Mar 13 20:27:17 2016 +0900)
+* 22651e8 - Merge pull request #16 from taiki45/drop-supporting-ruby1.9 (Beth Skurrie, Sat Mar 12 14:04:41 2016 +1100)
+* 3dbaa38 - Merge pull request #15 from taiki45/suppress-rspec-warnings (Sergei Matheson, Fri Mar 11 09:29:26 2016 +1100)
+* 656c98a - Merge pull request #14 from taiki45/nested-query (Sergei Matheson, Fri Mar 11 09:19:58 2016 +1100)
+* 85fbb09 - Drop supporting ruby1.9 (Taiki Ono, Thu Mar 10 23:01:54 2016 +0900)
+* 966fa3a - `raise_error` should be with specific error (Taiki Ono, Thu Mar 10 22:50:13 2016 +0900)
+* 2861742 - Cosmetic change (Taiki Ono, Thu Mar 10 22:11:51 2016 +0900)
+* c491682 - `QueryHash` accepts nested hash query (Taiki Ono, Thu Mar 10 21:24:41 2016 +0900)
 
 ### 0.5.4 (4 November 2015)
 

data/RELEASING.md

@@ -3,7 +3,7 @@
 1. Increment the version in `lib/pact/support/version.rb`
 2. Update the `CHANGELOG.md` using:
 
-      $ git log --pretty=format:'  * %h - %s (%an, %ad)'
+      $ git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
 
 3. Add files to git
 

data/lib/pact/consumer_contract/query_hash.rb

@@ -9,27 +9,23 @@ module Pact
     include Pact::Matchers
     include SymbolizeKeys
 
-    def initialize query
+    def initialize(query)
       @hash = query.nil? ? query : convert_to_hash_of_arrays(query)
     end
 
-    def convert_to_hash_of_arrays query
-      symbolize_keys(query).each_with_object({}) {|(k,v), hash| hash[k] = [*v] }
-    end
-
-    def as_json opts = {}
+    def as_json(opts = {})
       @hash
     end
 
-    def to_json opts = {}
+    def to_json(opts = {})
       as_json(opts).to_json(opts)
     end
 
-    def eql? other
+    def eql?(other)
       self == other
     end
 
-    def == other
+    def ==(other)
       QueryHash === other && other.query == query
     end
 
@@ -51,5 +47,18 @@ module Pact
       @hash && @hash.empty?
     end
 
+    private
+
+    def convert_to_hash_of_arrays(query)
+      query.each_with_object({}) {|(k, v), hash| insert(hash, k, v) }
+    end
+
+    def insert(hash, k, v)
+      if Hash === v
+        v.each {|k2, v2| insert(hash, :"#{k}[#{k2}]", v2) }
+      else
+        hash[k.to_sym] = [*v]
+      end
+    end
   end
 end

data/lib/pact/reification.rb

@@ -8,7 +8,7 @@ module Pact
     def self.from_term(term)
       case term
       when Pact::Term, Regexp, Pact::SomethingLike, Pact::ArrayLike
-        term.generate
+        from_term(term.generate)
       when Hash
         term.inject({}) do |mem, (key,term)|
           mem[key] = from_term(term)
@@ -20,19 +20,23 @@ module Pact
         from_term(term.to_hash)
       when Pact::QueryString
         from_term(term.query)
-        when Pact::QueryHash
+      when Pact::QueryHash
         term.query.map { |k, v|
           if v.nil?
             k
           elsif v.is_a?(Array) #For cases where there are multiple instance of the same parameter
-            v.map { |x| "#{k}=#{from_term(x)}"}.join('&')
+            v.map { |x| "#{k}=#{escape(from_term(x))}"}.join('&')
           else
-            "#{k}=#{from_term(v)}"
+            "#{k}=#{escape(from_term(v))}"
           end
         }.join('&')
       else
         term
       end
     end
+
+    def self.escape(str)
+      URI.encode_www_form_component(str)
+    end
   end
 end

data/lib/pact/shared/dsl.rb

@@ -62,7 +62,7 @@ module Pact
       new_instance_of_delegation_target_class = self.new(*args)
       dsl_delegator_class = self.const_get('DSL_DELEGATOR_CLASS')
       dsl_delegator = dsl_delegator_class.new(new_instance_of_delegation_target_class)
-      dsl_delegator.instance_eval_with_previous_context_available(&block)
+      dsl_delegator.instance_eval_with_previous_context_available(&block) if block
       new_instance_of_delegation_target_class.finalize
       new_instance_of_delegation_target_class
     end
@@ -73,4 +73,4 @@ module Pact
     end
 
   end
-end
+end

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "0.5.4"
+    VERSION = "0.5.5"
   end
 end

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

@@ -34,6 +34,45 @@ module Pact
           expect(subject.difference(other)).to_not be_empty
         end
       end
+
+      context "with nested query" do
+        let(:query) { { param: { a: { aa: '11', bb: '22' }, b: '2' } } }
+
+        context "when the other is same" do
+          let(:other) { QueryString.new('param[b]=2&param[a][aa]=11&param[a][bb]=22') }
+
+          it 'returns an empty diff' do
+            expect(subject.difference(other)).to be_empty
+          end
+        end
+
+        context "when the other has extra param" do
+          let(:other) { QueryString.new('param[b]=2&param[c]=1') }
+
+          it 'returns the diff' do
+            expect(subject.difference(other)).not_to be_empty
+            expect(subject.difference(other).keys).to contain_exactly(:"param[a][aa]", :"param[a][bb]", :"param[c]")
+          end
+        end
+
+        context "when the other has different value with value difference" do
+          let(:other) { QueryString.new('param[b]=2&param[a][aa]=00&param[a][bb]=22') }
+
+          it 'returns the diff' do
+            expect(subject.difference(other)).not_to be_empty
+            expect(subject.difference(other).keys).to contain_exactly(:"param[a][aa]")
+          end
+        end
+
+        context "when the other has different value without structural difference" do
+          let(:other) { QueryString.new('param[b]=2&param[a]=11') }
+
+          it 'returns the diff' do
+            expect(subject.difference(other)).not_to be_empty
+            expect(subject.difference(other).keys).to contain_exactly(:"param[a]", :"param[a][aa]", :"param[a][bb]")
+          end
+        end
+      end
     end
 
     describe "#as_json" do

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

@@ -331,6 +331,15 @@ module Pact
           end
         end
 
+        context 'when the queries are defined by nested hashes' do
+          let(:expected_query) { { params: 'hello', nested: { a: { aa: '11', bb: '22' }, b: '2' }, params3: 'small' } }
+          let(:actual_query) { 'params3=small&nested[a][aa]=11&nested[a][bb]=22&nested[b]=2&params=hello'  }
+
+          it "does match" do
+            expect(subject.matches? actual_request).to be true
+          end
+        end
+
         context 'when the queries are defined by hashes, order does not matter but content does' do
           let(:expected_query) { { params: 'hello', params2: 'world', params3: 'small' } }
           let(:actual_query) { 'params3=big&params2=world&params=hello' }
@@ -358,6 +367,15 @@ module Pact
           end
         end
 
+        context 'when the queries are defined by nested hashes holding Pact Terms, order does not matter but content does' do
+          let(:expected_query) { { params: { a: 'hello', b: Term.new(generate: 'world', matcher: /w\w+/) } } }
+          let(:actual_query) { 'params[a]=hello&params[b]=wroom'}
+
+          it "does match" do
+            expect(subject.matches? actual_request).to be true
+          end
+        end
+
         context 'when the queries are defined by hashes holding Pact Terms and the regex does not match' do
           let(:expected_query) { { params: 'hello', params2: Term.new(generate: 'world', matcher: /w\w+/), params3: 'small' } }
           let(:actual_query) { 'params3=small&params=hello&params2=bonjour'}
@@ -367,6 +385,15 @@ module Pact
           end
         end
 
+        context 'when the queries are defined by nested hashes holding Pact Terms and the regex does not match' do
+          let(:expected_query) { { params: { a: 'hello', b: Term.new(generate: 'world', matcher: /w\w+/) } } }
+          let(:actual_query) { 'params[a]=hello&params[b]=bonjour'}
+
+          it "does match" do
+            expect(subject.matches? actual_request).to be false
+          end
+        end
+
         context 'when the query is a hash containing arrays, to denote multiple parameters with the same name' do
           let(:expected_query) {
             { simple_param: "hi",
@@ -456,4 +483,4 @@ module Pact
       end
     end
   end
-end
+end

data/spec/lib/pact/reification_spec.rb

@@ -63,6 +63,27 @@ module Pact
 
     end
 
+    context "when nested SomethingLike" do
+
+      let(:request) {
+        Pact::SomethingLike.new(
+          {
+            a: 'String',
+            b: Pact::SomethingLike.new(
+              c: 'NestedString'
+            )
+          }
+        )
+      }
+
+      subject { Reification.from_term(request)}
+
+      it "returns the contents of the SomethingLike" do
+        expect(subject).to eq({a: 'String', b: { c: 'NestedString' }})
+      end
+
+    end
+
     context "when ArrayLike" do
 
       let(:request) { Pact::ArrayLike.new({a: 'String'}, {min: 3})}
@@ -98,6 +119,17 @@ module Pact
       end
     end
 
+    context "when Hash Query with UTF-8 string" do
+
+      subject { Reification.from_term(query)}
+
+      let(:query) { QueryHash.new( {param: 'ILove', extra: '寿司'})}
+
+      it "returns the hash with escaping UTF-8 string" do
+        expect(subject).to eq("param=ILove&extra=%E5%AF%BF%E5%8F%B8")
+      end
+    end
+
     context "when Hash Query with embeded terms" do
 
       subject { Reification.from_term(query)}

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

@@ -9,6 +9,10 @@ module Pact
       extend DSL
       attr_accessor :thing, :blah, :global, :the_block, :another_block, :finalized
 
+      def initialize
+        @thing = 0
+      end
+
       dsl do
         def with_thing thing
           self.thing = thing
@@ -36,51 +40,61 @@ module Pact
     end
 
     describe "build" do
-       before do
-          def my_local_method
-             'LA LA LA'
-          end
+      context "with block" do
+        before do
+            def my_local_method
+              'LA LA LA'
+            end
 
-          my_local_var = 123
+            my_local_var = 123
 
-          local_app = "I'm a local app"
+            local_app = "I'm a local app"
 
-          @test = TestDSL.build do
-            with_thing my_local_method
-            with_blah my_local_var
-            with_global global_method
-            with_block do
-              global_app
-            end
-            with_another_block do
-              local_app
+            @test = TestDSL.build do
+              with_thing my_local_method
+              with_blah my_local_var
+              with_global global_method
+              with_block do
+                global_app
+              end
+              with_another_block do
+                local_app
+              end
             end
-          end
-       end
+        end
+
+        it "supports using a local variable" do
+            expect(@test.blah).to eq 123
+        end
+
+        it "supports using a local method" do
+            expect(@test.thing).to eq 'LA LA LA'
+        end
 
-       it "supports using a local variable" do
-          expect(@test.blah).to eq 123
-       end
+        it "supports using global methods from other files" do
+          expect(@test.global).to eq "I'm global"
+        end
 
-       it "supports using a local method" do
-          expect(@test.thing).to eq 'LA LA LA'
-       end
+        it "supports using a local method to provide the app" do
+          expect(@test.another_block.call).to eq("I'm a local app")
+        end
 
-       it "supports using global methods from other files" do
-         expect(@test.global).to eq "I'm global"
-       end
+        it "should support using a global method to provide the app but it doesn't" do
+          expect(@test.the_block.call).to eq("I'm a global app")
+        end
 
-       it "supports using a local method to provide the app" do
-         expect(@test.another_block.call).to eq("I'm a local app")
-       end
+        it "calls finalize" do
+          expect(@test.finalized).to be true
+        end
+      end
 
-       it "should support using a global method to provide the app but it doesn't" do
-         expect(@test.the_block.call).to eq("I'm a global app")
-       end
+      context "without block" do
+        let(:test) { TestDSL.build }
 
-       it "calls finalize" do
-        expect(@test.finalized).to be true
-       end
+        it "initializes an instance" do
+          expect(test.thing).to eq(0)
+        end
+      end
     end
   end
 end

data/spec/support/shared_examples_for_request.rb

@@ -115,12 +115,12 @@ shared_examples "a request" do
 
     it "blows up if method is absent" do
       raw_request.delete 'method'
-      expect { described_class.from_hash(raw_request) }.to raise_error
+      expect { described_class.from_hash(raw_request) }.to raise_error(KeyError)
     end
 
     it "blows up if path is absent" do
       raw_request.delete 'path'
-      expect { described_class.from_hash(raw_request) }.to raise_error
+      expect { described_class.from_hash(raw_request) }.to raise_error(KeyError)
     end
 
     it "does not blow up if body is missing" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp