pact-mock_service 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3675552ba3caef160721edfcd17ebaea904b60da
-  data.tar.gz: 21c7f09e8cd25570599d26519f76caab79df59de
+  metadata.gz: f0d1aba37b7982a136a668228738b17109da4795
+  data.tar.gz: 2ae252683df598c9d17a03865b923f441882856b
 SHA512:
-  metadata.gz: 6433bb82c9702192c88e4b0b107c93a03b2985d3efaf6e54b1e2b7969016df264dbc5601f5c3fe87c8c0d709ba715bade1c52726016c557ec30ce8d0d5a61093
-  data.tar.gz: ab60286205a9b24ded877e33359b5622a8c66ac7b231e90688cf00010cd4c08a078204011dcdb9c8fb6f0cdb04ffb35b79a0c93f97b3c0acafa8fb92d3bca5b2
+  metadata.gz: c4f981a667185d6d770dbd5e828faf9806549dbe7d307884c634911d794cee99cf71f4fbf3f9c115f0d1757f6c5ecaefc9001cc8854c0b1e9badc80d598b336c
+  data.tar.gz: 9c641e2b04891110955a8bd8dd3d6171abde8f967e0225eeb675a3e5a757444ac143c02e88e788d1eb06af04b22df166fc0b274cd9625beee5df4c7f241bd38b

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)'
 
+### 0.2.1 (24 October 2014)
+
+* a4cf177 - Reifying the request headers, query and body when serializing pact. This allows Pact::Term to be used in the request without breaking verification for non-ruby providers that can't deserialise the Ruby specific serialisation of Pact::Terms. (Beth, Fri Oct 24 15:27:18 2014 +1100)
+
 ### 0.2.0 (24 October 2014)
 
 * d071e2c - Added field to /pact request body to specify the pact directory (Beth, Fri Oct 24 09:22:06 2014 +1100)

data/lib/pact/consumer/mock_service/interaction_replay.rb

@@ -119,7 +119,7 @@ module Pact
       end
 
       def response_from response
-        [response.status, (response.headers || {}).to_hash, [render_body(Pact::Reification.from_term(response.body))]]
+        [response.status, (Pact::Reification.from_term(response.headers) || {}).to_hash, [render_body(Pact::Reification.from_term(response.body))]]
       end
 
       def render_body body

data/lib/pact/consumer_contract/request_decorator.rb

@@ -20,9 +20,9 @@ module Pact
         method: request.method,
         path: request.path,
       }
-      hash[:query]   = query           if request.specified?(:query)
-      hash[:headers] = request.headers if request.specified?(:headers)
-      hash[:body]    = body            if request.specified?(:body)
+      hash[:query]   = query   if request.specified?(:query)
+      hash[:headers] = headers if request.specified?(:headers)
+      hash[:body]    = body    if request.specified?(:body)
       hash
     end
 
@@ -30,14 +30,14 @@ module Pact
 
     attr_reader :request
 
+    def headers
+      Pact::Reification.from_term(request.headers)
+    end
+
     # This feels wrong to be checking the class type of the Query
     # Do this better somehow.
     def query
-      if request.query.is_a?(Pact::QueryHash)
-        Pact::Reification.from_term(request.query)
-      else
-        request.query
-      end
+      Pact::Reification.from_term(request.query)
     end
 
     # This feels wrong to be checking the class type of the body
@@ -46,7 +46,7 @@ module Pact
       if content_type_is_form && request.body.is_a?(Hash)
         URI.encode_www_form convert_hash_body_to_array_of_arrays
       else
-        request.body
+        Pact::Reification.from_term(request.body)
       end
     end
 
@@ -59,10 +59,10 @@ module Pact
       arrays = []
       request.body.keys.each do | key |
         [*request.body[key]].each do | value |
-          arrays << [key, Pact::Reification.from_term(value)]
+          arrays << [key, value]
         end
       end
-      arrays
+      Pact::Reification.from_term arrays
     end
 
   end

data/lib/pact/mock_service/version.rb

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

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

@@ -0,0 +1,77 @@
+require 'spec_helper'
+require 'pact/consumer_contract/request_decorator'
+require 'pact/consumer/request'
+
+module Pact
+  describe RequestDecorator do
+
+    let(:body) { {some: "bod"} }
+    let(:headers) { {some: "header"} }
+    let(:request_params) do
+      {
+        method: :get,
+        headers: headers,
+        path: "/",
+        body: body
+      }
+    end
+
+    let(:request) { Pact::Request::Expected.from_hash(request_params) }
+
+    subject { RequestDecorator.new(request) }
+
+    describe "#to_json" do
+
+      let(:parsed_json) { JSON.parse subject.to_json, symbolize_names: true }
+
+      context "body" do
+
+        context "with a Content-Type of form and body specified as a hash with a Pact::Term" do
+          let(:headers) { { 'Content-Type' => 'application/x-www-form-urlencoded' } }
+          let(:body) { {"param" => Pact::Term.new(generate: 'apple', matcher: /a/ )} }
+
+          it "reifies the body for compatibility with pact-specification 1.0.0" do
+            expect(parsed_json[:body]).to eq "param=apple"
+          end
+        end
+
+        context "with a Content-Type of form and body specified as a hash with an array value" do
+          let(:headers) { { 'Content-Type' => 'application/x-www-form-urlencoded' } }
+          let(:body) { {"param" => ['pear', Pact::Term.new(generate: 'apple', matcher: /a/ )] } }
+
+          it "reifies the body for compatibility with pact-specification 1.0.0" do
+            expect(parsed_json[:body]).to eq "param=pear&param=apple"
+          end
+        end
+
+        context "with no Content-Type and a body specified as a Hash" do
+          it "renders the body as JSON" do
+            expect(parsed_json[:body]).to eq body
+          end
+        end
+
+        context "with a Pact::Term in the JSON body" do
+          let(:body) { {"param" => Pact::Term.new(generate: 'apple', matcher: /a/ )} }
+          it "reifes the body for compatibility with pact-specification 1.0.0" do
+            expect(parsed_json[:body]).to eq param: 'apple'
+          end
+        end
+
+        context "with a Pact::Term as the body" do
+          let(:body) { Pact::Term.new(generate: 'apple', matcher: /a/ ) }
+          it "reifes the body for compatibility with pact-specification 1.0.0" do
+            expect(parsed_json[:body]).to eq 'apple'
+          end
+        end
+
+        context "with a String body" do
+          let(:body) { "a body" }
+          it "renders the String body" do
+            expect(parsed_json[:body]).to eq body
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,69 @@
+require 'spec_helper'
+require 'pact/consumer_contract/request_decorator'
+require 'pact/consumer/request'
+
+module Pact
+  describe RequestDecorator do
+
+    let(:headers) { { some: "header" } }
+    let(:request_params) do
+      {
+        method: :get,
+        headers: headers,
+        path: "/"
+      }
+    end
+
+    let(:request) { Pact::Request::Expected.from_hash(request_params) }
+
+    subject { RequestDecorator.new(request) }
+
+    describe "#to_json" do
+
+      let(:parsed_json) { JSON.parse subject.to_json, symbolize_names: true }
+
+      context "headers" do
+
+        it "renders the headers" do
+          expect(parsed_json[:headers][:some]).to eq "header"
+        end
+
+        context "with a Pact::Term in the headers" do
+          let(:headers) { { 'X-Zebra' => Pact::Term.new(generate: 'zebra', matcher: /z/) } }
+
+          it "reifies the headers" do
+            expect(parsed_json[:headers][:'X-Zebra']).to eq 'zebra'
+          end
+        end
+
+        context "with no headers specified" do
+          let(:request_params) do
+            {
+              method: :get,
+              path: "/"
+            }
+          end
+
+          it "does not include the key" do
+            expect(parsed_json).to_not have_key(:headers)
+          end
+        end
+
+       context "with nil headers specified" do
+         let(:request_params) do
+           {
+             method: :get,
+             path: "/",
+             headers: nil
+           }
+         end
+
+         it "renders the headers as nil, but this would really be silly and will probably cause problems down the line" do
+           expect(parsed_json.fetch(:headers)).to be nil
+         end
+       end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'pact/consumer_contract/request_decorator'
+require 'pact/consumer/request'
+
+module Pact
+  describe RequestDecorator do
+
+    let(:path) { "/zebras/1" }
+    let(:request_params) do
+      {
+        method: :get,
+        path: path
+      }
+    end
+
+    let(:request) { Pact::Request::Expected.from_hash(request_params) }
+
+    subject { RequestDecorator.new(request) }
+
+    describe "#to_json" do
+
+      let(:parsed_json) { JSON.parse subject.to_json, symbolize_names: true }
+
+      context "path" do
+
+        context "with a String path" do
+          it "renders the path" do
+            expect(parsed_json[:path]).to eq path
+          end
+        end
+
+        context "with a Pact::Term path", pending: "Pact::Terms for paths are not implemented yet"  do
+          let(:path) { Pact::Term.new(generate: "/zebras/1", matcher: %r{/zebras/\d})  }
+
+          it "reifies the path for compatibility with pact-specification 1.0.0" do
+            expect(parsed_json[:path]).to eq path
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,74 @@
+require 'spec_helper'
+require 'pact/consumer_contract/request_decorator'
+require 'pact/consumer/request'
+
+module Pact
+  describe RequestDecorator do
+
+    let(:headers) { {some: "header"} }
+    let(:query) { "param=foo" }
+    let(:request_params) do
+      {
+        method: :get,
+        query: query,
+        headers: headers,
+        path: "/"
+      }
+    end
+
+    let(:request) { Pact::Request::Expected.from_hash(request_params) }
+
+    subject { RequestDecorator.new(request) }
+
+    describe "#to_json" do
+
+      let(:parsed_json) { JSON.parse subject.to_json, symbolize_names: true }
+
+      context "query" do
+        context "with a query hash containing a Pact::Term" do
+          let(:query) { { param: Pact::Term.new(generate: 'apple', matcher: /a/) } }
+
+          it "reifies the query for compatibility with pact-specification 1.0.0" do
+            expect(parsed_json[:query]).to eq "param=apple"
+          end
+        end
+
+        context "with a Pact::Term query" do
+          let(:query) { Pact::Term.new(generate: 'param=apple', matcher: /param=a/) }
+
+          it "reifies the query for compatibility with the pact-specification 1.0.0" do
+            expect(parsed_json[:query]).to eq 'param=apple'
+          end
+        end
+
+        context "when the query is not specified" do
+          let(:request_params) do
+            {
+              method: :get,
+              path: "/"
+            }
+          end
+
+          it "does not include the key" do
+            expect(parsed_json).to_not have_key(:query)
+          end
+        end
+
+        context "when the query is nil" do
+          let(:request_params) do
+            {
+              method: :get,
+              path: "/",
+              query: nil
+            }
+          end
+
+          it "includes the query as nil" do
+            expect(parsed_json.fetch(:query)).to be nil
+          end
+        end
+      end
+
+    end
+  end
+end

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

@@ -5,9 +5,9 @@ require 'pact/consumer/request'
 module Pact
   describe RequestDecorator do
 
-    let(:options) { {some: 'opts'} }
-    let(:body) { {some: "bod"} }
-    let(:headers) { {some: "header"} }
+    let(:options) { { some: 'opts' } }
+    let(:body) { { some: "bod" } }
+    let(:headers) { { some: "header" } }
     let(:query) { "param=foo" }
     let(:request_params) do
       {
@@ -15,7 +15,8 @@ module Pact
         query: query,
         headers: headers,
         path: "/",
-        body: body
+        body: body,
+        options: options
       }
     end
 
@@ -35,46 +36,6 @@ module Pact
         expect(subject.to_json).to_not include('options')
       end
 
-      context "with a query hash containing a Pact::Term" do
-        let(:query) { { param: Pact::Term.new(generate: 'apple', matcher: /a/) } }
-
-        it "reifies the query for backwards compatibility with pact-specification 1.0.0" do
-          expect(parsed_json[:query]).to eq "param=apple"
-        end
-      end
-
-      context "with a Pact::Term query" do
-        let(:query) { Pact::Term.new(generate: 'param=apple', matcher: /param=a/) }
-
-        it "serialises the Pact::Term to Ruby specific JSON that is not compatible with pact-specification 1.0.0" do
-          expect(subject.to_json).to include "Pact::Term"
-        end
-      end
-
-      context "with a Content-Type of form and body specified as a hash with a Pact::Term" do
-        let(:headers) { { 'Content-Type' => 'application/x-www-form-urlencoded' } }
-        let(:body) { {"param" => Pact::Term.new(generate: 'apple', matcher: /a/ )} }
-
-        it "reifies the body for backwards compatibility with pact-specification 1.0.0" do
-          expect(parsed_json[:body]).to eq "param=apple"
-        end
-      end
-
-      context "with a Content-Type of form and body specified as a hash with an array value" do
-        let(:headers) { { 'Content-Type' => 'application/x-www-form-urlencoded' } }
-        let(:body) { {"param" => ['pear', Pact::Term.new(generate: 'apple', matcher: /a/ )] } }
-
-        it "reifies the body for backwards compatibility with pact-specification 1.0.0" do
-          expect(parsed_json[:body]).to eq "param=pear&param=apple"
-        end
-      end
-
-      context "with no Content-Type and a body specified as a Hash" do
-        it "renders the body as JSON" do
-          expect(parsed_json[:body]).to eq body
-        end
-      end
     end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-mock_service
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Fraser
@@ -12,244 +12,244 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   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: 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: 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: 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: 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: 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: webrick
   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: pact-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.1
 - !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'
 - !ruby/object:Gem::Dependency
   name: faraday
   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: 
@@ -264,9 +264,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -312,6 +312,10 @@ files:
 - spec/lib/pact/consumer/mock_service_client_spec.rb
 - spec/lib/pact/consumer/service_consumer_spec.rb
 - spec/lib/pact/consumer_contract/consumer_contract_writer_spec.rb
+- spec/lib/pact/consumer_contract/request_decorator_body_spec.rb
+- spec/lib/pact/consumer_contract/request_decorator_headers_spec.rb
+- spec/lib/pact/consumer_contract/request_decorator_path_spec.rb
+- spec/lib/pact/consumer_contract/request_decorator_query_spec.rb
 - spec/lib/pact/consumer_contract/request_decorator_spec.rb
 - spec/lib/pact/consumer_contract/response_decorator_spec.rb
 - spec/lib/pact/mock_service/interaction_decorator_spec.rb
@@ -356,17 +360,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: Provides a mock service for use with Pact
@@ -381,6 +385,10 @@ test_files:
 - spec/lib/pact/consumer/mock_service_client_spec.rb
 - spec/lib/pact/consumer/service_consumer_spec.rb
 - spec/lib/pact/consumer_contract/consumer_contract_writer_spec.rb
+- spec/lib/pact/consumer_contract/request_decorator_body_spec.rb
+- spec/lib/pact/consumer_contract/request_decorator_headers_spec.rb
+- spec/lib/pact/consumer_contract/request_decorator_path_spec.rb
+- spec/lib/pact/consumer_contract/request_decorator_query_spec.rb
 - spec/lib/pact/consumer_contract/request_decorator_spec.rb
 - spec/lib/pact/consumer_contract/response_decorator_spec.rb
 - spec/lib/pact/mock_service/interaction_decorator_spec.rb