pact-support 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4363cf97810f093eaefcfdc2fb89e1bbc073f695
-  data.tar.gz: 8e5bfdb3ef4122179865b7a267e570145b644f04
+  metadata.gz: e910cf32ae5812de2e20eb59b3e5ca000f4bb993
+  data.tar.gz: c075489026ea2c5b501c673d085bf0ffe27434a1
 SHA512:
-  metadata.gz: d35a47659cc146ee79b06f7c63e479ac9b942e2133e0f67d863f8a0d1f55159494406bed0f494a8507b7350b7351b765c8a52e4ca277f00f68d905b9bfe1d4b5
-  data.tar.gz: cfcb7b67e4945b8e32c00d1131232b28a3cb1e748a13617503dcfa7d57764029bbb83da6e1be300196066b95cfc8a2276c06ea0fd250adab9bc10d0bb0c3097c
+  metadata.gz: 06989f174ace83fa1ccccf4ea8bdad96d188a0899706aef0f7bed147eb86682644ed08457f6974a01e2e5abfd425c01f0787d2bbd4f73e9d9258cea1a3c1d7b7
+  data.tar.gz: 7d3bb57ae30029fd219bf1f54fc1fe7f471940365f4431f5f11b20d18ae67470729a648a41191d1daf799f63b78485ce913d22497a776b8a799fdbecc4823739

data/CHANGELOG.md

@@ -2,6 +2,15 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)'
 
+### 0.2.1 (21 January 2015)
+
+* 4e26c75 - Ignore HTTP method case when determining if routes match. https://github.com/bethesque/pact-support/issues/3 (Beth, Tue Jan 20 20:15:20 2015 +1100)
+* af96eba - Allow request path to be a Pact::Term (Beth, Tue Jan 20 19:37:23 2015 +1100)
+
+### 0.1.4 (20 January 2015)
+
+A naughty release because bumping the minor version to 0.2.0 means I have to upgrade all the gems.
+
 ### 0.2.0 (20 January 2015)
 
 * bb5d893 - Added option to UnixDiffFormatter to not show the explanation (Beth, Tue Jan 20 08:39:42 2015 +1100)

data/lib/pact/consumer_contract/request.rb

@@ -31,7 +31,9 @@ module Pact
       end
 
       def matches_route? actual_request
-        diff({:method => method, :path => path}, {:method => actual_request.method, :path => actual_request.path}).empty?
+        route = {:method => method.upcase, :path => path}
+        other_route = {:method => actual_request.method.upcase, :path => actual_request.path}
+        diff(route, other_route).empty?
       end
 
       def difference(actual_request)

data/lib/pact/shared/request.rb

@@ -16,7 +16,7 @@ module Pact
 
       def initialize(method, path, headers, body, query)
         @method = method.to_s
-        @path = path.chomp('/')
+        @path = path.respond_to?(:chomp) ? path.chomp('/') : path #TODO get rid of the chomp in v2
         @headers = Hash === headers ? Headers.new(headers) : headers # Could be a NullExpectation - TODO make this more elegant
         @body = body
         @query = is_unspecified?(query) ? query : Pact::Query.create(query)
@@ -27,10 +27,9 @@ module Pact
           method: method,
           path: path,
         }
-
-        hash.merge!(query: query) if specified?(:query)
-        hash.merge!(headers: headers) if specified?(:headers)
-        hash.merge!(body: body) if specified?(:body)
+        hash[:query] = query if specified?(:query)
+        hash[:headers] = headers if specified?(:headers)
+        hash[:body] = body if specified?(:body)
         hash
       end
 
@@ -79,14 +78,17 @@ module Pact
       end
 
       def to_hash_without_body_or_query
-        keep_keys = [:method, :path, :headers]
-        to_hash.reject{ |key, value| !keep_keys.include? key }.tap do | hash |
-          hash[:method] = method.upcase
-        end
+        hash = {
+          method: method.upcase,
+          path: path
+        }
+        hash[:headers] = headers if specified?(:headers)
+        hash
       end
 
       def display_path
-        path.empty? ? "/" : path
+        reified_path = Pact::Reification.from_term(path)
+        reified_path.empty? ? "/" : reified_path
       end
 
       def display_query

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

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

@@ -24,6 +24,16 @@ module Pact
             expect(subject == other).to be false
           end
         end
+        context "with a SomethingLike" do
+          let(:response)       { {body: {age: SomethingLike.new(20)}  } }
+          let(:other_response) { {body: {age: SomethingLike.new(20)}  } }
+          let(:other)          { InteractionFactory.create(response: other_response) }
+          subject              { InteractionFactory.create response: response }
+
+          it "returns true" do
+            expect(subject == other).to be true
+          end
+         end
       end
 
       describe "matches_criteria?" do

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

@@ -26,6 +26,26 @@ module Pact
       end
     end
 
+    describe "matches_route?" do
+      context "when the case of the method is different but the path is the same" do
+        subject { Request::Expected.from_hash(method: 'get', path: '/') }
+        let(:other) { Consumer::Request::Actual.from_hash(method: 'get', path: '/', query: nil, headers: {}) }
+
+        it "returns true" do
+          expect(subject.matches_route?(other)).to be true
+        end
+      end
+
+      context "when the path is a Pact::Term" do
+        subject { Request::Expected.from_hash(method: 'get', path: Pact::Term.new(matcher: %r{/alligators/.*}, generate: '/alligators/Mary')) }
+        let(:other) { Consumer::Request::Actual.from_hash(method: 'get', path: '/alligators/John', query: nil, headers: {}) }
+
+        it "returns true" do
+          expect(subject.matches_route?(other)).to be true
+        end
+      end
+    end
+
     describe "matching to actual requests" do
 
       subject { Request::Expected.new(expected_method, expected_path, expected_headers, expected_body, expected_query, options) }
@@ -398,8 +418,6 @@ module Pact
         end
       end
 
-
-
       context "when in the body a string is expected, but a number is found" do
         let(:actual_body) { { thing: 123} }
         let(:expected_body) { { thing: "123" } }

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

@@ -67,6 +67,14 @@ module Pact
           end
         end
 
+        context "with a Pact::Term for the path" do
+          subject { TestRequest.new("get", Pact::Term.new(matcher: /a/, generate: '/apple'), {}, {} , "").method_and_path }
+
+          it "uses the generate value" do
+            expect(subject).to eq("GET /apple")
+          end
+        end
+
         context "with a path" do
           subject { TestRequest.new("get", "/something", {}, {} , "").method_and_path }
 

data/spec/lib/pact/something_like_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 module Pact
   describe SomethingLike do
+
     describe 'json_create' do
       let(:json) do
 '
@@ -11,11 +12,12 @@ module Pact
 }
 '
       end
+
       subject { SomethingLike.json_create(JSON.parse(json)) }
+
       it "creates a SomethingLike object from json" do
         expect(subject).to eq(SomethingLike.new({"thing" => "blah"}))
       end
     end
   end
-
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Fraser
@@ -12,202 +12,202 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.7
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: find_a_port
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.3
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.18.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -221,9 +221,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -344,17 +344,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Shared code for Pact gems
@@ -412,4 +412,3 @@ test_files:
 - spec/support/test_app_fail.json
 - spec/support/test_app_pass.json
 - spec/support/test_app_with_right_content_type_differ.json
-has_rdoc: