pact-mock_service 0.0.1 → 0.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjM1YTc2NzkzNDg1MjEzZDEwMDMyY2YxZWZlMGE1MjdlYjQyZTI2Nw==
-  data.tar.gz: !binary |-
-    ZDgyMzllNDQ5MTc1NDlkNjRhZmQyYzU1ZTRiM2M5N2JkYjRkNWUxMA==
+SHA1:
+  metadata.gz: d4d778c67c786242b411bfeb2ea68de4d8a8ba02
+  data.tar.gz: be3a2b3caab987b807e6844f35311450e51b5a7f
 SHA512:
-  metadata.gz: !binary |-
-    NmQ3ZmMyNjQ4ZDBmN2U5N2E5OTI5NDVhZWE1MDg3M2FiNzQ4MjlmMWE0MzBl
-    YmM3MWU1OWY2NTg4MGRiYWU2OWM4NDZjYjlhNGQwNzRlMDA0M2QyMDk3Nzdj
-    NTA4MGI0YzAzOTg5ZWI5OTczNThkNzE3MWJhYmFmZTNjZjQxZGQ=
-  data.tar.gz: !binary |-
-    MDQxMWZmNGI3YjI5NmM1ZDk4Yzc3YjkyM2U5Y2Q3OGE2NWMwYWE3ZGFkMjVi
-    Y2ZlZTU5N2U5ZjM4YTEwMTVmNjFhNmJmNGU3ZTE0NjhjYTI2MzExOTY2ZmVm
-    ZGZmYzRjZTdhZjJlZTE5MjA5OGE4NzQxZWU1MzA4YzAzNWU5MTg=
+  metadata.gz: 77f56fc00125a93dc33d68e7ec16c1355393fa05f30b89df2370000b794ebe0d6a245d11c35476155c1934f29a09df1b7aec9a5e772996919d4573df6f9702d0
+  data.tar.gz: b3b60e97d6553ce8318bbe71e76c681263fed8598fe5cf22e25db38a0be6ac1704c4cad12ef7f169706b8d9e8ddfd5727a12eff13d6e55ca8bddf247e6d92ff8

data/.gitignore

@@ -27,3 +27,4 @@ spec/pacts
 log
 .idea
 reports
+Gemfile.lock

data/.rspec

@@ -1,2 +1,3 @@
 --color
 --format documentation
+--require spec_helper

data/CHANGELOG.md

@@ -2,3 +2,7 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)'
 
+### 0.1.0 (22 October 2014)
+
+* 62caf8e - Removed Gemfile.lock from git (bethesque, Wed Oct 22 13:07:54 2014 +1100)
+* 5b4d54e - Moved JSON serialisation code into decorators. Serialisation between DSL and mock service is different from serialisation to the pact file. (bethesque, Wed Oct 22 13:07:00 2014 +1100)

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

@@ -20,10 +20,11 @@ module Pact
       end
 
       def respond env
-        interaction = Interaction.from_hash(JSON.load(env['rack.input'].string))
+        request_body = env['rack.input'].string
+        interaction = Interaction.from_hash(JSON.load(request_body))
         interaction_list.add interaction
         logger.info "Registered expected interaction #{interaction.request.method_and_path}"
-        logger.debug JSON.pretty_generate JSON.parse(interaction.to_json)
+        logger.debug JSON.pretty_generate JSON.parse(request_body)
         [200, {}, ['Added interaction']]
       end
     end

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

@@ -3,6 +3,7 @@ require 'pact/consumer/mock_service/rack_request_helper'
 require 'pact/consumer/mock_service/interaction_mismatch'
 require 'pact/consumer_contract'
 require 'pact/consumer/interactions_filter'
+require 'pact/mock_service/response_decorator'
 
 module Pact
   module Consumer
@@ -37,7 +38,7 @@ module Pact
       def find_response request_hash
         actual_request = Request::Actual.from_hash(request_hash)
         logger.info "Received request #{actual_request.method_and_path}"
-        logger.debug pretty_generate actual_request
+        logger.debug pretty_generate request_hash
         candidate_interactions = interaction_list.find_candidate_interactions actual_request
         matching_interactions = find_matching_interactions actual_request, from: candidate_interactions
 
@@ -61,7 +62,7 @@ module Pact
         add_verified_interaction interaction
         response = response_from(interaction.response)
         logger.info "Found matching response for #{interaction.request.method_and_path}"
-        logger.debug pretty_generate(interaction.response)
+        logger.debug pretty_generate(Pact::MockService::ResponseDecorator.new(interaction.response))
         response
       end
 
@@ -76,7 +77,7 @@ module Pact
       def handle_more_than_one_matching_interaction actual_request, matching_interactions
         logger.error "Multiple interactions found for #{actual_request.method_and_path}:"
         matching_interactions.each do | interaction |
-          logger.debug pretty_generate(interaction)
+          logger.debug pretty_generate(Pact::MockService::InteractionDecorator.new(interaction))
         end
         multiple_interactions_found_response actual_request, matching_interactions
       end
@@ -88,7 +89,7 @@ module Pact
       def request_summary_for interaction
         summary = {:description => interaction.description}
         summary[:provider_state] if interaction.provider_state
-        summary[:request] = interaction.request
+        summary[:request] = Pact::MockService::RequestDecorator.new(interaction.request)
         summary
       end
 

data/lib/pact/consumer/mock_service_client.rb

@@ -1,5 +1,5 @@
 require 'net/http'
-require 'pact/consumer/mock_service_interaction_expectation'
+require 'pact/mock_service/interaction_decorator'
 
 module Pact
   module Consumer
@@ -32,7 +32,11 @@ module Pact
       end
 
       def add_expected_interaction interaction
-        response = http.request_post('/interactions', MockServiceInteractionExpectation.new(interaction).to_json, MOCK_SERVICE_ADMINISTRATON_HEADERS.merge("Content-Type" => "application/json"))
+        response = http.request_post(
+          '/interactions',
+          interaction_json(interaction),
+          MOCK_SERVICE_ADMINISTRATON_HEADERS.merge("Content-Type" => "application/json")
+        )
         raise "\e[31m#{response.body}\e[m" unless response.is_a? Net::HTTPSuccess
       end
 
@@ -60,6 +64,10 @@ module Pact
         end
       end
 
+      def interaction_json interaction
+        Pact::MockService::InteractionDecorator.new(interaction).to_json
+      end
+
     end
   end
 end

data/lib/pact/consumer_contract/consumer_contract_decorator.rb

@@ -0,0 +1,33 @@
+require 'pact/shared/active_support_support'
+require 'pact/consumer_contract/interaction_decorator'
+
+module Pact
+  class ConsumerContractDecorator
+
+    include ActiveSupportSupport
+
+    def initialize consumer_contract
+      @consumer_contract = consumer_contract
+    end
+
+    def as_json(options = {})
+      fix_all_the_things(
+        consumer: consumer_contract.consumer.as_json,
+        provider: consumer_contract.provider.as_json,
+        interactions: consumer_contract.interactions.collect{ |i| InteractionDecorator.new(i).as_json},
+        metadata: {
+          pactSpecificationVersion: "1.0.0"
+        }
+      )
+    end
+
+    def to_json(options = {})
+      as_json.to_json(options)
+    end
+
+    private
+
+    attr_reader :consumer_contract
+
+  end
+end

data/lib/pact/consumer_contract/consumer_contract_writer.rb

@@ -1,12 +1,17 @@
 require 'pact/consumer_contract'
 require 'pact/consumer/interactions_filter'
 require 'pact/consumer_contract/file_name'
+require 'pact/consumer_contract/pact_file'
+require 'pact/consumer_contract/consumer_contract_decorator'
+require 'pact/shared/active_support_support'
 
 module Pact
 
   class ConsumerContractWriter
 
-    attr_reader :consumer_contract_details, :pactfile_write_mode, :interactions, :logger
+    include Pact::FileName
+    include Pact::PactFile
+    include ActiveSupportSupport
 
     def initialize consumer_contract_details, logger
       @logger = logger
@@ -23,13 +28,37 @@ module Pact
     end
 
     def write
-      consumer_contract.update_pactfile
-      consumer_contract.to_json
+      update_pactfile
+      pact_json
+    end
+
+    private
+
+    attr_reader :consumer_contract_details, :pactfile_write_mode, :interactions, :logger
+
+    def pactfile_path
+      raise 'You must specify a consumer and provider name' unless (consumer_name && provider_name)
+      file_path consumer_name, provider_name, Pact.configuration.pact_dir
+    end
+
+    def update_pactfile
+      logger.debug "Updating pact file for #{provider_name} at #{pactfile_path}"
+      File.open(pactfile_path, 'w') do |f|
+        f.write pact_json
+      end
+    end
+
+    def pact_json
+      @pact_json ||= fix_json_formatting(JSON.pretty_generate(decorated_pact))
+    end
+
+    def decorated_pact
+      @decorated_pact ||= Pact::ConsumerContractDecorator.new(consumer_contract)
     end
 
     def interactions_for_new_consumer_contract
       if pactfile_write_mode == :update
-        merged_interactions = existing_interactions
+        merged_interactions = existing_interactions.dup
         filter = Consumer::UpdatableInteractionsFilter.new(merged_interactions)
         interactions.each {|i| filter << i }
         merged_interactions
@@ -62,10 +91,6 @@ module Pact
       File.exist?(pactfile_path)
     end
 
-    def pactfile_path
-      Pact::FileName.file_path consumer_contract_details[:consumer][:name], consumer_contract_details[:provider][:name]
-    end
-
     def existing_consumer_contract
       Pact::ConsumerContract.from_uri(pactfile_path)
     end
@@ -79,6 +104,14 @@ module Pact
       $stdout.puts msg
       logger.info msg
     end
+
+    def consumer_name
+      consumer_contract_details[:consumer][:name]
+    end
+
+    def provider_name
+      consumer_contract_details[:provider][:name]
+    end
   end
 
 end

data/lib/pact/consumer_contract/interaction_decorator.rb

@@ -0,0 +1,43 @@
+require 'pact/shared/active_support_support'
+require 'pact/consumer_contract/request_decorator'
+require 'pact/consumer_contract/response_decorator'
+
+module Pact
+  class InteractionDecorator
+
+    include ActiveSupportSupport
+
+    def initialize interaction
+      @interaction = interaction
+    end
+
+    def as_json options = {}
+      fix_all_the_things to_hash
+    end
+
+    def to_json(options = {})
+      as_json.to_json(options)
+    end
+
+    def to_hash
+      hash = { :description => interaction.description }
+      hash[:provider_state] = interaction.provider_state if interaction.provider_state
+      hash[:request] = decorate_request.as_json
+      hash[:response] = decorate_response.as_json
+      hash
+    end
+
+    private
+
+    attr_reader :interaction
+
+    def decorate_request
+      RequestDecorator.new(interaction.request)
+    end
+
+    def decorate_response
+      ResponseDecorator.new(interaction.response)
+    end
+
+  end
+end

data/lib/pact/consumer_contract/request_decorator.rb

@@ -0,0 +1,69 @@
+require 'pact/reification'
+
+module Pact
+  class RequestDecorator
+
+    def initialize request
+      @request = request
+    end
+
+    def to_json(options = {})
+      as_json.to_json(options)
+    end
+
+    def as_json options = {}
+      to_hash
+    end
+
+    def to_hash
+      hash = {
+        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
+    end
+
+    private
+
+    attr_reader :request
+
+    # 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
+    end
+
+    # This feels wrong to be checking the class type of the body
+    # Do this better somehow.
+    def body
+      if content_type_is_form && request.body.is_a?(Hash)
+        URI.encode_www_form convert_hash_body_to_array_of_arrays
+      else
+        request.body
+      end
+    end
+
+    def content_type_is_form
+      request.content_type? 'application/x-www-form-urlencoded'
+    end
+
+    #This probably belongs somewhere else.
+    def convert_hash_body_to_array_of_arrays
+      arrays = []
+      request.body.keys.each do | key |
+        [*request.body[key]].each do | value |
+          arrays << [key, Pact::Reification.from_term(value)]
+        end
+      end
+      arrays
+    end
+
+  end
+end

data/lib/pact/consumer_contract/response_decorator.rb

@@ -0,0 +1,29 @@
+module Pact
+  class ResponseDecorator
+
+    def initialize response
+      @response = response
+    end
+
+    def to_json(options = {})
+      as_json.to_json(options)
+    end
+
+    def as_json options = {}
+      to_hash
+    end
+
+    def to_hash
+      hash = {}
+      hash[:status]  = response.status  if response.specified?(:status)
+      hash[:headers] = response.headers if response.specified?(:headers)
+      hash[:body]    = response.body    if response.specified?(:body)
+      hash
+    end
+
+    private
+
+    attr_reader :response
+
+  end
+end

data/lib/pact/mock_service/interaction_decorator.rb

@@ -0,0 +1,48 @@
+require 'pact/shared/active_support_support'
+require 'pact/mock_service/request_decorator'
+require 'pact/mock_service/response_decorator'
+
+# Represents the Interaction in the form required by the MockService
+# The json generated will be posted to the MockService to register the expectation
+
+module Pact
+  module MockService
+    class InteractionDecorator
+
+      include ActiveSupportSupport
+
+      def initialize interaction
+        @interaction = interaction
+      end
+
+      def as_json options = {}
+        fix_all_the_things to_hash
+      end
+
+      def to_json(options = {})
+        as_json.to_json(options)
+      end
+
+      def to_hash
+        hash = { :description => interaction.description }
+        hash[:provider_state] = interaction.provider_state if interaction.provider_state
+        hash[:request] = decorate_request.as_json
+        hash[:response] = decorate_response.as_json
+        hash
+      end
+
+      private
+
+      attr_reader :interaction
+
+      def decorate_request
+        RequestDecorator.new(interaction.request)
+      end
+
+      def decorate_response
+        ResponseDecorator.new(interaction.response)
+      end
+
+    end
+  end
+end

data/lib/pact/mock_service/request_decorator.rb

@@ -0,0 +1,36 @@
+module Pact
+  module MockService
+    class RequestDecorator
+
+      def initialize request
+        @request = request
+      end
+
+      def to_json(options = {})
+        as_json.to_json(options)
+      end
+
+      def as_json options = {}
+        to_hash
+      end
+
+      def to_hash
+        hash = {
+          method: request.method,
+          path: request.path,
+        }
+
+        hash[:query]   = request.query   if request.specified?(:query)
+        hash[:headers] = request.headers if request.specified?(:headers)
+        hash[:body]    = request.body    if request.specified?(:body)
+        hash[:options] = request.options if request.options.any?
+        hash
+      end
+
+      private
+
+      attr_reader :request
+
+    end
+  end
+end

data/lib/pact/mock_service/response_decorator.rb

@@ -0,0 +1,31 @@
+module Pact
+  module MockService
+    class ResponseDecorator
+
+      def initialize response
+        @response = response
+      end
+
+      def to_json(options = {})
+        as_json.to_json(options)
+      end
+
+      def as_json options = {}
+        to_hash
+      end
+
+      def to_hash
+        hash = {}
+        hash[:status]  = response.status  if response.specified?(:status)
+        hash[:headers] = response.headers if response.specified?(:headers)
+        hash[:body]    = response.body    if response.specified?(:body)
+        hash
+      end
+
+      private
+
+      attr_reader :response
+
+    end
+  end
+end

data/lib/pact/mock_service/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module MockService
-    VERSION = "0.0.1"
+    VERSION = "0.1.0"
   end
 end

data/pact-mock-service.gemspec

@@ -27,9 +27,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'webrick'
   gem.add_runtime_dependency 'term-ansicolor', '~> 1.0'
 
-  unless ENV['X_PACT_DEVELOPMENT']
-    gem.add_runtime_dependency 'pact-support', '~> 0.0.1'
-  end
+  gem.add_runtime_dependency 'pact-support', '~> 0.1.1'
 
   gem.add_development_dependency 'rake', '~> 10.0.3'
   gem.add_development_dependency 'webmock', '~> 1.18.0'

data/spec/lib/pact/consumer/mock_service_client_spec.rb

@@ -11,7 +11,7 @@ module Pact
 
       describe "#add_expected_interaction" do
         let(:interaction) { InteractionFactory.create }
-        let(:request_body) { MockServiceInteractionExpectation.new(interaction).to_json }
+        let(:request_body) { Pact::MockService::InteractionDecorator.new(interaction).to_json }
 
         context "when successful" do
           let!(:post_interaction) do

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

@@ -100,8 +100,8 @@ module Pact
     end
 
     describe "write" do
-      it "writes the pact file" do
-        expect_any_instance_of(ConsumerContract).to receive(:update_pactfile)
+      it "writes the pact file, this is a useless test" do
+        expect_any_instance_of(ConsumerContractWriter).to receive(:update_pactfile)
         consumer_contract_writer.write
       end
     end

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

@@ -0,0 +1,80 @@
+require 'spec_helper'
+require 'pact/consumer_contract/request_decorator'
+require 'pact/consumer/request'
+
+module Pact
+  describe RequestDecorator do
+
+    let(:options) { {some: 'opts'} }
+    let(:body) { {some: "bod"} }
+    let(:headers) { {some: "header"} }
+    let(:query) { "param=foo" }
+    let(:request_params) do
+      {
+        method: :get,
+        query: query,
+        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 }
+
+      it "renders the keys in a meaningful order" do
+        expect(subject.to_json).to match(/method.*path.*query.*headers.*body/)
+      end
+
+      it "does not render the options" do
+        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

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

@@ -0,0 +1,10 @@
+require 'pact/consumer_contract/response_decorator'
+require 'support/shared_examples_for_response_decorator'
+
+module Pact
+  describe ResponseDecorator do
+
+    include_examples "request decorator to_json"
+
+  end
+end

data/spec/lib/pact/mock_service/interaction_decorator_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+require 'pact/mock_service/interaction_decorator'
+
+module Pact
+  module MockService
+    describe InteractionDecorator do
+
+      describe "#to_json" do
+
+        let(:request) do
+          {
+            method: 'post',
+            path: '/foo',
+            body: Term.new(generate: 'waffle', matcher: /ffl/),
+            headers: { 'Content-Type' => 'application/json' },
+            query: '',
+          }
+        end
+
+        let(:response) do
+          { body: { baz: /qux/, wiffle: Term.new(generate: 'wiffle', matcher: /iff/) } }
+        end
+
+        let(:interaction) do
+          Interaction.from_hash(
+            'description' => 'description',
+            'provider_state' => 'provider_state',
+            'response' => response,
+            'request' => request)
+        end
+
+        subject { InteractionDecorator.new(interaction)  }
+
+        let(:parsed_result) do
+          JSON.load(subject.to_json)
+        end
+
+        it "contains the request" do
+          expect(parsed_result).to have_key('request')
+        end
+
+        it "contains the response" do
+          expect(parsed_result).to have_key('request')
+        end
+
+        it "contains the description" do
+          expect(parsed_result['description']).to eq 'description'
+        end
+
+        context "with a provider state" do
+          it "contains the provider_state" do
+            expect(parsed_result['provider_state']).to eq 'provider_state'
+          end
+        end
+
+        context "without a provider state" do
+
+          let(:interaction) do
+            Interaction.from_hash(
+              'description' => 'description',
+              'response' => response,
+              'request' => request)
+          end
+
+          it "does not contain the provider_state" do
+            expect(parsed_result).to_not have_key 'provider_state'
+          end
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,76 @@
+require 'spec_helper'
+require 'pact/mock_service/request_decorator'
+require 'pact/consumer_contract/request'
+
+
+module Pact
+  module MockService
+    describe RequestDecorator do
+
+      let(:options) { {} }
+      let(:body) { {some: "bod"} }
+      let(:headers) { {some: "header"} }
+      let(:request_params) do
+        {
+          method: :get,
+          query: "param=foo",
+          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}
+
+        it "renders the keys in a meaningful order" do
+          expect(subject.to_json).to match(/method.*path.*query.*headers.*body/)
+        end
+
+        context "with a body specified as a Hash" do
+          it "serialises the body as a Hash" do
+            expect(parsed_json[:body]).to eq body
+          end
+        end
+
+        context "with a body specified as a Hash containing a Pact::Term" do
+          let(:body) { { some: Pact::Term.new(generate: 'apple', matcher: /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
+      end
+
+      describe "#as_json" do
+        context "without options" do
+          it "does not include the options key" do
+            expect(subject.as_json.key?(:options)).to be false
+          end
+        end
+
+        context "with options" do
+          let(:request_params) do
+            {
+              method: :get,
+              path: "/",
+              options: options
+            }
+          end
+
+          let(:options) { {:opts => 'blah'} }
+
+          it "includes the options in the request hash" do
+            expect(subject.as_json[:options]).to eq options
+          end
+        end
+      end
+
+    end
+  end
+end

data/spec/lib/pact/mock_service/response_decorator_spec.rb

@@ -0,0 +1,12 @@
+require 'pact/mock_service/response_decorator'
+require 'support/shared_examples_for_response_decorator'
+
+module Pact
+  module MockService
+    describe ResponseDecorator do
+
+      include_examples "request decorator to_json"
+
+    end
+  end
+end

data/spec/support/shared_examples_for_response_decorator.rb

@@ -0,0 +1,25 @@
+require 'pact/consumer_contract/response'
+
+shared_examples_for "request decorator to_json" do
+
+  describe "#to_json" do
+
+    let(:response) { Pact::Response.new(status: 200, body: body) }
+    let(:body) { { baz: /qux/, wiffle: Pact::Term.new(generate: 'wiffle', matcher: /iff/) } }
+
+    let(:decorator) { described_class.new(response) }
+
+    subject { JSON.load decorator.to_json }
+
+    it "serialises regexes" do
+      expect(subject['body']['baz']).to eql /qux/
+    end
+
+    it "serialises terms" do
+      parsed_term = subject['body']['wiffle']
+      expect(parsed_term.matcher).to eql /iff/
+      expect(parsed_term.generate).to eql 'wiffle'
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-mock_service
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,34 +12,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-12 00:00:00.000000000 Z
+date: 2014-10-22 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
@@ -88,42 +88,42 @@ dependencies:
   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
@@ -140,6 +140,20 @@ dependencies:
     - - ~>
       - !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
@@ -172,14 +186,14 @@ dependencies:
   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
@@ -214,28 +228,28 @@ dependencies:
   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: 
@@ -255,7 +269,6 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -276,12 +289,17 @@ files:
 - lib/pact/consumer/mock_service/rack_request_helper.rb
 - lib/pact/consumer/mock_service/verification_get.rb
 - lib/pact/consumer/mock_service_client.rb
-- lib/pact/consumer/mock_service_interaction_expectation.rb
-- lib/pact/consumer/request.rb
 - lib/pact/consumer/server.rb
+- lib/pact/consumer_contract/consumer_contract_decorator.rb
 - lib/pact/consumer_contract/consumer_contract_writer.rb
+- lib/pact/consumer_contract/interaction_decorator.rb
+- lib/pact/consumer_contract/request_decorator.rb
+- lib/pact/consumer_contract/response_decorator.rb
 - lib/pact/mock_service.rb
 - lib/pact/mock_service/cli.rb
+- lib/pact/mock_service/interaction_decorator.rb
+- lib/pact/mock_service/request_decorator.rb
+- lib/pact/mock_service/response_decorator.rb
 - lib/pact/mock_service/version.rb
 - pact-mock-service.gemspec
 - spec/lib/pact/consumer/app_manager_spec.rb
@@ -292,9 +310,13 @@ files:
 - spec/lib/pact/consumer/mock_service/rack_request_helper_spec.rb
 - spec/lib/pact/consumer/mock_service/verification_get_spec.rb
 - spec/lib/pact/consumer/mock_service_client_spec.rb
-- spec/lib/pact/consumer/mock_service_interaction_expectation_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_spec.rb
+- spec/lib/pact/consumer_contract/response_decorator_spec.rb
+- spec/lib/pact/mock_service/interaction_decorator_spec.rb
+- spec/lib/pact/mock_service/request_decorator_spec.rb
+- spec/lib/pact/mock_service/response_decorator_spec.rb
 - spec/spec_helper.rb
 - spec/support/a_consumer-a_producer.json
 - spec/support/a_consumer-a_provider.json
@@ -315,6 +337,7 @@ files:
 - spec/support/options_app.rb
 - spec/support/pact_helper.rb
 - spec/support/shared_examples_for_request.rb
+- spec/support/shared_examples_for_response_decorator.rb
 - spec/support/spec_support.rb
 - spec/support/stubbing.json
 - spec/support/stubbing_using_allow.rb
@@ -333,17 +356,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.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Provides a mock service for use with Pact
@@ -356,9 +379,13 @@ test_files:
 - spec/lib/pact/consumer/mock_service/rack_request_helper_spec.rb
 - spec/lib/pact/consumer/mock_service/verification_get_spec.rb
 - spec/lib/pact/consumer/mock_service_client_spec.rb
-- spec/lib/pact/consumer/mock_service_interaction_expectation_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_spec.rb
+- spec/lib/pact/consumer_contract/response_decorator_spec.rb
+- spec/lib/pact/mock_service/interaction_decorator_spec.rb
+- spec/lib/pact/mock_service/request_decorator_spec.rb
+- spec/lib/pact/mock_service/response_decorator_spec.rb
 - spec/spec_helper.rb
 - spec/support/a_consumer-a_producer.json
 - spec/support/a_consumer-a_provider.json
@@ -379,6 +406,7 @@ test_files:
 - spec/support/options_app.rb
 - spec/support/pact_helper.rb
 - spec/support/shared_examples_for_request.rb
+- spec/support/shared_examples_for_response_decorator.rb
 - spec/support/spec_support.rb
 - spec/support/stubbing.json
 - spec/support/stubbing_using_allow.rb

data/Gemfile.lock

@@ -1,100 +0,0 @@
-PATH
-  remote: .
-  specs:
-    pact-mock_service (0.0.1)
-      awesome_print (~> 1.1)
-      find_a_port (~> 1.0.1)
-      json
-      rack
-      rack-test (~> 0.6.2)
-      rspec (>= 2.14)
-      term-ansicolor (~> 1.0)
-      thor
-      webrick
-
-PATH
-  remote: ../pact-support
-  specs:
-    pact-support (0.0.1)
-      awesome_print (~> 1.1)
-      find_a_port (~> 1.0.1)
-      json
-      rack-test (~> 0.6.2)
-      randexp (~> 0.1.7)
-      rspec (>= 2.14)
-      term-ansicolor (~> 1.0)
-      thor
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.1.1)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    addressable (2.3.6)
-    awesome_print (1.2.0)
-    coderay (1.1.0)
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.2.5)
-    fakefs (0.5.2)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    find_a_port (1.0.1)
-    hashie (2.1.1)
-    i18n (0.6.9)
-    json (1.8.1)
-    method_source (0.8.2)
-    minitest (5.3.4)
-    multipart-post (2.0.0)
-    pry (0.10.0)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rake (10.0.4)
-    randexp (0.1.7)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.6)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    safe_yaml (1.0.3)
-    slop (3.5.0)
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tins (1.3.3)
-    tzinfo (1.2.1)
-      thread_safe (~> 0.1)
-    webmock (1.18.0)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-    webrick (1.3.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport
-  fakefs (~> 0.4)
-  faraday
-  hashie (~> 2.0)
-  pact-mock_service!
-  pact-support!
-  pry
-  rake (~> 10.0.3)
-  webmock (~> 1.18.0)

data/lib/pact/consumer/mock_service_interaction_expectation.rb

@@ -1,37 +0,0 @@
-require 'pact/reification'
-
-# Represents the Interaction in the form required by the MockService
-# The json generated will be posted to the MockService to register the expectation
-module Pact
-  module Consumer
-    class MockServiceInteractionExpectation
-
-
-      def initialize interaction
-        @interaction = interaction
-      end
-
-      def to_hash
-        hash = {:description => interaction.description}
-        hash[:provider_state] = interaction.provider_state if interaction.provider_state
-        options = interaction.request.options.empty? ? {} : { options: interaction.request.options}
-        hash[:request] = interaction.request.as_json.merge(options)
-        hash[:response] = interaction.response
-        hash
-      end
-
-      def as_json options = {}
-        to_hash
-      end
-
-      def to_json opts = {}
-        as_json.to_json(opts)
-      end
-
-      private
-
-      attr_reader :interaction
-
-    end
-  end
-end

data/lib/pact/consumer/request.rb

@@ -1,27 +0,0 @@
-require 'pact/shared/request'
-require 'pact/shared/key_not_found'
-
-module Pact
-  module Consumer
-    module Request
-      class Actual < Pact::Request::Base
-
-        def self.from_hash(hash)
-          sym_hash = symbolize_keys hash
-          method = sym_hash.fetch(:method)
-          path = sym_hash.fetch(:path)
-          query = sym_hash.fetch(:query)
-          headers = sym_hash.fetch(:headers)
-          body = sym_hash.fetch(:body, nil)
-          new(method, path, headers, body, query)
-        end
-
-        protected
-
-        def self.key_not_found
-          nil
-        end
-      end
-    end
-  end
-end

data/spec/lib/pact/consumer/mock_service_interaction_expectation_spec.rb

@@ -1,54 +0,0 @@
-require 'spec_helper'
-require 'pact/consumer/mock_service_interaction_expectation'
-
-describe Pact::Consumer::MockServiceInteractionExpectation do
-  describe "as_json" do
-
-    let(:options ) { {} }
-    let(:request_as_json) { {a: 'request'} }
-    let(:request) { instance_double('Pact::Request::Expected', :as_json => request_as_json, :options => options)}
-    let(:response) { double('response') }
-    let(:generated_response ) { double('generated_response', :to_json => 'generated_response') }
-    let(:interaction) { instance_double('Pact::Interaction', :description => 'description', :request => request, :response => response, :provider_state => 'some state') }
-    subject { described_class.new(interaction)}
-    let(:expected_hash) { {:response => generated_response, :request => as_json_with_options, :description => '' } }
-
-    before do
-      allow(Pact::Reification).to receive(:from_term).with(response).and_return(generated_response)
-    end
-
-    it "includes the response" do
-      expect(subject.as_json[:response]).to eq response
-    end
-
-    it "includes the options in the request" do
-      expect(subject.as_json[:request]).to eq request_as_json
-    end
-
-    it "includes the provider state" do
-      expect(subject.as_json[:provider_state]).to eq 'some state'
-    end
-
-    it "includes the description" do
-      expect(subject.as_json[:description]).to eq 'description'
-    end
-
-    it "doesn't have any other keys" do
-      expect(subject.as_json.keys).to eq [:description, :provider_state, :request, :response]
-    end
-
-    context "without options" do
-      it "does not include the options key" do
-        expect(subject.as_json.key?(:options)).to be false
-      end
-    end
-
-    context "with options" do
-      let(:options) { {:opts => 'blah'} }
-      it "includes the options in the request hash" do
-        expect(subject.as_json[:request][:options]).to eq options
-      end
-    end
-  end
-
-end