pact-mock_service 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd03f421bbf55e3e676c14e1381c0b8276b65929
-  data.tar.gz: b083148cc1cc3d7ca79a2a42dc4b55b3b3129bf8
+  metadata.gz: 7ee9a3828c35ae046fc6c49f2826958f3154fb43
+  data.tar.gz: 046d77f2c46f7c34145b220086021224a44812fe
 SHA512:
-  metadata.gz: 5d19c285a1b6c2d97ff25407ede34967c06471ae80f965ddc3cc1ca24e08b313bfaafca9ac7c49f711879e549fee6109aa653430bd063944e4d65c026d163237
-  data.tar.gz: ed483795cb21f664e482499f53b0fade46e774d978c051edbe906c9b4d5f464433523e6c22d17adcce9690c9a73a4fffde2cb5bba10d2cf4c84094e5050cab5e
+  metadata.gz: 9d3bf0d82244b66bc143dac04ef445833a08744941939af21b10bfb71079dc7daa4fef33099e46075d49b827869f273a2b7c6f992e788eda2197142103aa0aa5
+  data.tar.gz: bbef13e0ed2761c155a2c2f8b4344735a6fe08ca4057c96faf6a518598e0357e52ca00b64c35a8688e95b1dba5697121a3d8a971c901b281a9f82382244666f4

data/CHANGELOG.md

@@ -2,6 +2,12 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)'
 
+### 0.4.0 (13 Feb 2015)
+
+* 73ddd98 - Added option to AppManager to set the pact_specification_version (Beth Skurrie, Fri Feb 13 17:41:42 2015 +1100)
+* e4a7405 - Make pactSpecificationVersion in pact file dynamic. (Beth Skurrie, Fri Feb 13 17:20:28 2015 +1100)
+* ed9c550 - Create --pact-specification-version option to toggle between v1 and v2 serialization (Beth Skurrie, Fri Feb 13 16:56:30 2015 +1100)
+
 ### 0.3.0 (4 Feb 2015)
 
 * 60869be - Refactor - moving classes from Pact::Consumer module into Pact::MockService module. (Beth Skurrie, Wed Feb 4 19:28:54 2015 +1100)

data/lib/pact/consumer_contract/consumer_contract_decorator.rb

@@ -6,17 +6,18 @@ module Pact
 
     include ActiveSupportSupport
 
-    def initialize consumer_contract
+    def initialize consumer_contract, decorator_options = {}
       @consumer_contract = consumer_contract
+      @decorator_options = decorator_options
     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},
+        interactions: consumer_contract.interactions.collect{ |i| InteractionDecorator.new(i, @decorator_options).as_json},
         metadata: {
-          pactSpecificationVersion: "1.0.0"
+          pactSpecificationVersion: pact_specification_version
         }
       )
     end
@@ -29,5 +30,9 @@ module Pact
 
     attr_reader :consumer_contract
 
+    def pact_specification_version
+      version = @decorator_options.fetch(:pact_specification_version)
+      "#{version[0]}.0.0" # Only care about the first digit
+    end
   end
 end

data/lib/pact/consumer_contract/consumer_contract_writer.rb

@@ -12,6 +12,8 @@ module Pact
 
   class ConsumerContractWriter
 
+    DEFAULT_PACT_SPECIFICATION_VERSION = '1.0.0'
+
     include Pact::FileName
     include Pact::PactFile
     include ActiveSupportSupport
@@ -21,6 +23,7 @@ module Pact
       @consumer_contract_details = consumer_contract_details
       @pactfile_write_mode = consumer_contract_details.fetch(:pactfile_write_mode, :overwrite).to_sym
       @interactions = consumer_contract_details.fetch(:interactions)
+      @pact_specification_version = (consumer_contract_details[:pact_specification_version] || DEFAULT_PACT_SPECIFICATION_VERSION).to_s
     end
 
     def consumer_contract
@@ -41,7 +44,7 @@ module Pact
 
     private
 
-    attr_reader :consumer_contract_details, :pactfile_write_mode, :interactions, :logger
+    attr_reader :consumer_contract_details, :pactfile_write_mode, :interactions, :logger, :pact_specification_version
 
     def update_pactfile
       logger.info log_message
@@ -57,7 +60,7 @@ module Pact
     end
 
     def decorated_pact
-      @decorated_pact ||= Pact::ConsumerContractDecorator.new(consumer_contract)
+      @decorated_pact ||= Pact::ConsumerContractDecorator.new(consumer_contract, pact_specification_version: pact_specification_version)
     end
 
     def interactions_for_new_consumer_contract

data/lib/pact/consumer_contract/interaction_decorator.rb

@@ -7,24 +7,21 @@ module Pact
 
     include ActiveSupportSupport
 
-    def initialize interaction
+    def initialize interaction, decorator_options = {}
       @interaction = interaction
+      @decorator_options = decorator_options
     end
 
     def as_json options = {}
-      fix_all_the_things to_hash
+      hash = { :description => interaction.description }
+      hash[:provider_state] = interaction.provider_state if interaction.provider_state
+      hash[:request] = decorate_request.as_json(options)
+      hash[:response] = decorate_response.as_json(options)
+      fix_all_the_things 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
+      as_json(options).to_json(options)
     end
 
     private
@@ -32,11 +29,11 @@ module Pact
     attr_reader :interaction
 
     def decorate_request
-      RequestDecorator.new(interaction.request)
+      RequestDecorator.new(interaction.request, @decorator_options)
     end
 
     def decorate_response
-      ResponseDecorator.new(interaction.response)
+      ResponseDecorator.new(interaction.response, @decorator_options)
     end
 
   end

data/lib/pact/consumer_contract/request_decorator.rb

@@ -3,8 +3,9 @@ require 'pact/reification'
 module Pact
   class RequestDecorator
 
-    def initialize request
+    def initialize request, decorator_options = {}
       @request = request
+      @decorator_options = decorator_options
     end
 
     def to_json(options = {})

data/lib/pact/consumer_contract/response_decorator.rb

@@ -1,8 +1,12 @@
+require 'pact/matching_rules'
+require 'pact/term'
+
 module Pact
   class ResponseDecorator
 
-    def initialize response
+    def initialize response, decorator_options = {}
       @response = response
+      @decorator_options = decorator_options
     end
 
     def to_json(options = {})
@@ -10,6 +14,14 @@ module Pact
     end
 
     def as_json options = {}
+      include_matching_rules? ? with_matching_rules(attributes_hash) : attributes_hash
+    end
+
+    private
+
+    attr_reader :response
+
+    def attributes_hash
       hash = {}
       hash[:status]  = response.status  if response.specified?(:status)
       hash[:headers] = response.headers if response.specified?(:headers)
@@ -17,9 +29,19 @@ module Pact
       hash
     end
 
-    private
+    def include_matching_rules?
+      pact_specification_version && !pact_specification_version.start_with?('1')
+    end
 
-    attr_reader :response
+    def with_matching_rules hash
+      matching_rules = Pact::MatchingRules.extract hash
+      example = Pact::Reification.from_term hash
+      return example if matching_rules.empty?
+      example.merge(responseMatchingRules: matching_rules)
+    end
 
+    def pact_specification_version
+      @decorator_options[:pact_specification_version]
+    end
   end
 end

data/lib/pact/mock_service/app.rb

@@ -17,8 +17,8 @@ module Pact
     class App
 
       def initialize options = {}
-        @name = options.fetch(:name, "MockService")
         logger = Logger.from_options(options)
+        @name = options.fetch(:name, "MockService")
         @session = Session.new(options.merge(logger: logger))
         request_handlers = RequestHandlers.new(@name, logger, @session, options)
         @app = Rack::Builder.app do

data/lib/pact/mock_service/app_manager.rb

@@ -22,12 +22,12 @@ module Pact
         @app_registrations = []
       end
 
-      def register_mock_service_for name, url
+      def register_mock_service_for name, url, options = {}
         uri = URI(url)
         raise "Currently only http is supported" unless uri.scheme == 'http'
         raise "Currently only services on localhost are supported" unless uri.host == 'localhost'
 
-        register(Pact::MockService.new(log_file: create_log_file(name), name: name, pact_dir: pact_dir), uri.port)
+        register(Pact::MockService.new(log_file: create_log_file(name), name: name, pact_dir: pact_dir, pact_specification_version: options[:pact_specification_version]), uri.port)
       end
 
       def register(app, port = FindAPort.available_port)

data/lib/pact/mock_service/cli.rb

@@ -16,6 +16,7 @@ module Pact
       method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS"
       method_option :cors, aliases: "-o", desc: "Support browser security in tests by responding to OPTIONS requests and adding CORS headers to mocked responses"
       method_option :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written"
+      method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact", default: '1'
       method_option :consumer, desc: "Consumer name"
       method_option :provider, desc: "Provider name"
 
@@ -28,6 +29,7 @@ module Pact
       method_option :port, aliases: "-p", desc: "Port on which to run the service"
       method_option :log_dir, aliases: "-l", desc: "File to which to log output"
       method_option :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written"
+      method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact", default: '1'
       method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS"
       method_option :cors, aliases: "-o", desc: "Support browser security in tests by responding to OPTIONS requests and adding CORS headers to mocked responses"
 
@@ -42,6 +44,7 @@ module Pact
       method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS"
       method_option :cors, aliases: "-o", desc: "Support browser security in tests by responding to OPTIONS requests and adding CORS headers to mocked responses"
       method_option :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written"
+      method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact", default: '1'
       method_option :consumer, desc: "Consumer name"
       method_option :provider, desc: "Provider name"
       method_option :pid_dir, desc: "PID dir", default: 'tmp/pids'
@@ -66,6 +69,7 @@ module Pact
       method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS"
       method_option :cors, aliases: "-o", desc: "Support browser security in tests by responding to OPTIONS requests and adding CORS headers to mocked responses"
       method_option :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written"
+      method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact", default: '1'
       method_option :consumer, desc: "Consumer name"
       method_option :provider, desc: "Provider name"
       method_option :pid_dir, desc: "PID dir", default: 'tmp/pids'
@@ -82,6 +86,7 @@ module Pact
       method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS"
       method_option :cors, aliases: "-o", desc: "Support browser security in tests by responding to OPTIONS requests and adding CORS headers to mocked responses"
       method_option :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written", default: "."
+      method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact", default: '1'
       method_option :pid_dir, desc: "PID dir", default: "tmp/pids"
 
       def control_start
@@ -104,6 +109,7 @@ module Pact
       method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS"
       method_option :cors, aliases: "-o", desc: "Support browser security in tests by responding to OPTIONS requests and adding CORS headers to mocked responses"
       method_option :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written", default: "."
+      method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact", default: '1'
       method_option :pid_dir, desc: "PID dir", default: "tmp/pids"
 
       def control_restart

data/lib/pact/mock_service/run.rb

@@ -50,7 +50,8 @@ module Pact
           pact_dir: options[:pact_dir],
           consumer: options[:consumer],
           provider: options[:provider],
-          cors_enabled: options[:cors]
+          cors_enabled: options[:cors],
+          pact_specification_version: options[:pact_specification_version]
         }
         service_options[:log_file] = open_log_file if options[:log]
         service_options

data/lib/pact/mock_service/session.rb

@@ -22,7 +22,8 @@ module Pact
           pact_dir: options[:pact_dir],
           consumer: {name: options[:consumer]},
           provider: {name: options[:provider]},
-          interactions: verified_interactions
+          interactions: verified_interactions,
+          pact_specification_version: options[:pact_specification_version]
         }
       end
 

data/lib/pact/mock_service/spawn.rb

@@ -41,7 +41,8 @@ module Pact
           consumer: consumer,
           provider: provider,
           pact_dir: options[:pact_dir] || ".",
-          cors_enabled: options[:cors_enabled]
+          cors_enabled: options[:cors_enabled],
+          pact_specification_version: options[:pact_specification_version]
         )
       end
 

data/lib/pact/mock_service/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module MockService
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-mock_service
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,230 +12,230 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-13 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: 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.2.1
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.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'
 - !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: 
@@ -250,6 +250,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- Gemfile
+- LICENSE.txt
+- README.md
 - bin/pact-mock-service
 - lib/pact/consumer/mock_service/cors_origin_header_middleware.rb
 - lib/pact/consumer/mock_service/error_handler.rb
@@ -261,10 +265,11 @@ files:
 - 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/app.rb
 - lib/pact/mock_service/app_manager.rb
-- lib/pact/mock_service/cli/pidfile.rb
 - lib/pact/mock_service/cli.rb
+- lib/pact/mock_service/cli/pidfile.rb
 - lib/pact/mock_service/client.rb
 - lib/pact/mock_service/control_server/app.rb
 - lib/pact/mock_service/control_server/delegator.rb
@@ -284,6 +289,7 @@ files:
 - lib/pact/mock_service/interactions/verified_interactions.rb
 - lib/pact/mock_service/logger.rb
 - lib/pact/mock_service/request_decorator.rb
+- lib/pact/mock_service/request_handlers.rb
 - lib/pact/mock_service/request_handlers/base_administration_request_handler.rb
 - lib/pact/mock_service/request_handlers/base_request_handler.rb
 - lib/pact/mock_service/request_handlers/index_get.rb
@@ -296,7 +302,6 @@ files:
 - lib/pact/mock_service/request_handlers/options.rb
 - lib/pact/mock_service/request_handlers/pact_post.rb
 - lib/pact/mock_service/request_handlers/verification_get.rb
-- lib/pact/mock_service/request_handlers.rb
 - lib/pact/mock_service/response_decorator.rb
 - lib/pact/mock_service/run.rb
 - lib/pact/mock_service/server/restart.rb
@@ -305,11 +310,6 @@ files:
 - lib/pact/mock_service/session.rb
 - lib/pact/mock_service/spawn.rb
 - lib/pact/mock_service/version.rb
-- lib/pact/mock_service.rb
-- Gemfile
-- LICENSE.txt
-- README.md
-- CHANGELOG.md
 homepage: https://github.com/bethesque/pact-mock_service
 licenses:
 - MIT
@@ -320,17 +320,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.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Provides a mock service for use with Pact