pact-mock_service 0.2.3.pre.rc2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 200c03efe0a34bab41ab409685601a5d069e5319
-  data.tar.gz: ffa20a890680ccf3dc0bc3c1aa20a78de93e64f6
+  metadata.gz: 22b2ac0e4b25a237d1b534c112e0dae09fbf268f
+  data.tar.gz: 2d3d54b21a35501ea75660f2007a17a8be8c12f7
 SHA512:
-  metadata.gz: 143b3ff38ebc4689c56201b6f6280dd089a4a77883284571c7a07e89e1bdeb5b3b5b78a4eabb5226c7bfab4d5c797c436395c6e7b0c34050e9e32834b8993f05
-  data.tar.gz: 42a1f1bb0d3f374fa23b739b3bfb2273d46a51babced8496d1814e174f6da465896cce4f1fbb414f20fcad47fb346cf3b1d4fee136cdf4ebde2177586ea3d258
+  metadata.gz: 535ec260ca77b6b4e02f7f35959695a0991c5ec62b16c7a9b16411b77665fcbda76873daf20146ff809dc10e2d1ffeb0741570b75a17fd9bcae783f3d521cd56
+  data.tar.gz: 42f362f541e289fe68358cedcb39573c144131615f7b0f78470276fc32c7d39d541c15a534af93289dcd51489a3093bd0e7d97ff6303ea3537a45289a71781bb

data/CHANGELOG.md

@@ -2,6 +2,12 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)'
 
+### 0.2.3 (21 Jan 2015)
+
+* 560671e - Add support for using Pact::Terms in the path (Beth, Wed Jan 21 07:42:10 2015 +1100)
+* 4324a97 - Renamed --cors-enabled to --cors (Beth, Wed Jan 21 07:28:34 2015 +1100)
+* 5f5ee7e - Set Access-Control-Allow-Origin header to the the request Origin when populated. (Beth, Tue Jan 13 16:03:37 2015 +1100)
+
 ### 0.2.3.rc2 (13 Jan 2015)
 
 * daf0696 - Added --consumer and --provider options to CLI. Automatically write pact if both options are given at startup. (Beth, Mon Jan 5 20:48:47 2015 +1100)

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

@@ -14,6 +14,7 @@ require 'pact/consumer/mock_service/verification_get'
 require 'pact/consumer/mock_service/log_get'
 require 'pact/consumer/mock_service/pact_post'
 require 'pact/consumer/mock_service/options'
+require 'pact/consumer/mock_service/cors_origin_header_middleware'
 require 'pact/support'
 
 module Pact
@@ -22,85 +23,100 @@ module Pact
     class MockService
 
       def initialize options = {}
-        log_description = configure_logger options
-
-        @name = options.fetch(:name, "MockService")
-        pact_dir = options[:pact_dir]
-        expected_interactions = ExpectedInteractions.new
-        actual_interactions = ActualInteractions.new
-        verified_interactions = VerifiedInteractions.new
-        @consumer_contact_details = {
-          pact_dir: options[:pact_dir],
-          consumer: {name: options[:consumer]},
-          provider: {name: options[:provider]},
-          interactions: verified_interactions
-        }
-
-        @handlers = [
-          Options.new(@name, @logger, options[:cors_enabled]),
-          MissingInteractionsGet.new(@name, @logger, expected_interactions, actual_interactions),
-          VerificationGet.new(@name, @logger, expected_interactions, actual_interactions, log_description),
-          InteractionPost.new(@name, @logger, expected_interactions, verified_interactions),
-          InteractionDelete.new(@name, @logger, expected_interactions, actual_interactions),
-          LogGet.new(@name, @logger),
-          PactPost.new(@name, @logger, verified_interactions, pact_dir, options[:consumer_contract_details]),
-          InteractionReplay.new(@name, @logger, expected_interactions, actual_interactions, verified_interactions, options[:cors_enabled])
-        ]
+        inner_app = InnerApp.new(options)
+        @app = CorsOriginHeaderMiddleware.new(inner_app, options[:cors_enabled])
       end
 
       def call env
-        response = []
-        begin
-          relevant_handler = @handlers.detect { |handler| handler.match? env }
-          res = relevant_handler.respond(env)
-          response = relevant_handler.enable_cors? ? add_cors_header(res) : res
-        rescue StandardError => e
-          @logger.error "Error ocurred in mock service: #{e.class} - #{e.message}"
-          @logger.error e.backtrace.join("\n")
-          response = [500, {'Content-Type' => 'application/json'}, [{message: e.message, backtrace: e.backtrace}.to_json]]
-        rescue Exception => e
-          @logger.error "Exception ocurred in mock service: #{e.class} - #{e.message}"
-          @logger.error e.backtrace.join("\n")
-          raise e
-        end
-        response
+        @app.call env
       end
 
-      def write_pact_if_configured
-        consumer_contract_writer = ConsumerContractWriter.new(@consumer_contact_details, StdoutLogger.new)
-        consumer_contract_writer.write if consumer_contract_writer.can_write?
+      def shutdown
+        @app.shutdown
       end
 
-      private
+      class InnerApp
+
+        def initialize options = {}
+          log_description = configure_logger options
 
-      def configure_logger options
-        options = {log_file: $stdout}.merge options
-        log_stream = options[:log_file]
-        @logger = Logger.new log_stream
-        @logger.formatter = options[:log_formatter] if options[:log_formatter]
-        @logger.level = Pact.configuration.logger.level
+          @name = options.fetch(:name, "MockService")
+          pact_dir = options[:pact_dir]
+          expected_interactions = ExpectedInteractions.new
+          actual_interactions = ActualInteractions.new
+          verified_interactions = VerifiedInteractions.new
+          @consumer_contact_details = {
+            pact_dir: options[:pact_dir],
+            consumer: {name: options[:consumer]},
+            provider: {name: options[:provider]},
+            interactions: verified_interactions
+          }
 
-        if log_stream.is_a? File
-           File.absolute_path(log_stream).gsub(Dir.pwd + "/", '')
-        else
-          "standard out/err"
+          @handlers = [
+            Options.new(@name, @logger, options[:cors_enabled]),
+            MissingInteractionsGet.new(@name, @logger, expected_interactions, actual_interactions),
+            VerificationGet.new(@name, @logger, expected_interactions, actual_interactions, log_description),
+            InteractionPost.new(@name, @logger, expected_interactions, verified_interactions),
+            InteractionDelete.new(@name, @logger, expected_interactions, actual_interactions),
+            LogGet.new(@name, @logger),
+            PactPost.new(@name, @logger, verified_interactions, pact_dir, options[:consumer_contract_details]),
+            InteractionReplay.new(@name, @logger, expected_interactions, actual_interactions, verified_interactions, options[:cors_enabled])
+          ]
         end
-      end
 
-      def to_s
-        "#{@name} #{super.to_s}"
-      end
+        def call env
+          response = []
+          begin
+            relevant_handler = @handlers.detect { |handler| handler.match? env }
+            response = relevant_handler.respond(env)
+          rescue StandardError => e
+            @logger.error "Error ocurred in mock service: #{e.class} - #{e.message}"
+            @logger.error e.backtrace.join("\n")
+            response = [500, {'Content-Type' => 'application/json'}, [{message: e.message, backtrace: e.backtrace}.to_json]]
+          rescue Exception => e
+            @logger.error "Exception ocurred in mock service: #{e.class} - #{e.message}"
+            @logger.error e.backtrace.join("\n")
+            raise e
+          end
+          response
+        end
 
-      class StdoutLogger
-        def info message
-          $stdout.puts "\n#{message}"
+        def shutdown
+          write_pact_if_configured
         end
-      end
 
-      def add_cors_header response
-        [response[0], response[1].merge('Access-Control-Allow-Origin' => '*'), response[2]]
-      end
+        private
+
+        def write_pact_if_configured
+          consumer_contract_writer = ConsumerContractWriter.new(@consumer_contact_details, StdoutLogger.new)
+          consumer_contract_writer.write if consumer_contract_writer.can_write?
+        end
 
+        def configure_logger options
+          options = {log_file: $stdout}.merge options
+          log_stream = options[:log_file]
+          @logger = Logger.new log_stream
+          @logger.formatter = options[:log_formatter] if options[:log_formatter]
+          @logger.level = Pact.configuration.logger.level
+
+          if log_stream.is_a? File
+             File.absolute_path(log_stream).gsub(Dir.pwd + "/", '')
+          else
+            "standard out/err"
+          end
+        end
+
+        def to_s
+          "#{@name} #{super.to_s}"
+        end
+
+        class StdoutLogger
+          def info message
+            $stdout.puts "\n#{message}"
+          end
+        end
+
+      end
     end
   end
 end

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

@@ -0,0 +1,30 @@
+module Pact
+  module Consumer
+    class CorsOriginHeaderMiddleware
+
+      def initialize app, cors_enabled
+        @app = app
+        @cors_enabled = cors_enabled
+      end
+
+      def call env
+        response = @app.call env
+        if env['HTTP_X_PACT_MOCK_SERVICE'] || @cors_enabled
+          add_cors_header env, response
+        else
+          response
+        end
+      end
+
+      def shutdown
+        @app.shutdown
+      end
+
+      private
+
+      def add_cors_header env, response
+        [response[0], response[1].merge('Access-Control-Allow-Origin' => env.fetch('HTTP_ORIGIN','*')), response[2]]
+      end
+    end
+  end
+end

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

@@ -40,10 +40,6 @@ module Pact
         find_response request_as_hash_from(env)
       end
 
-      def enable_cors?
-        @cors_enabled
-      end
-
       private
 
       def find_response request_hash

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

@@ -21,20 +21,13 @@ module Pact
       end
 
       def respond env
-        logger.info "Received OPTIONS request for #{env['HTTP_ACCESS_CONTROL_REQUEST_METHOD']} #{env['PATH_INFO']}. Returning CORS headers."
-        [200,
-         {
-           'Access-Control-Allow-Origin' => '*',
-           'Access-Control-Allow-Headers' => headers_from(env)["Access-Control-Request-Headers"],
-           'Access-Control-Allow-Methods' => 'DELETE, POST, GET, HEAD, PUT, TRACE, CONNECT'
-          },
-         []
-        ]
-      end
-
-      # Access-Control-Domain does not work on OPTIONs requests.
-      def enable_cors?
-        false
+        cors_headers = {
+         'Access-Control-Allow-Origin' => env.fetch('HTTP_ORIGIN','*'),
+         'Access-Control-Allow-Headers' => headers_from(env)["Access-Control-Request-Headers"],
+         'Access-Control-Allow-Methods' => 'DELETE, POST, GET, HEAD, PUT, TRACE, CONNECT'
+        }
+        logger.info "Received OPTIONS request for mock service administration endpoint #{env['HTTP_ACCESS_CONTROL_REQUEST_METHOD']} #{env['PATH_INFO']}. Returning CORS headers: #{cors_headers.to_json}."
+        [200, cors_headers, []]
       end
 
       def is_options_request? env

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

@@ -15,14 +15,10 @@ module Pact
         raise NotImplementedError
       end
 
-      def enable_cors?
-        true
-      end
-
       private
 
       def request_header_match? env
-        headers_from(env)['X-Pact-Mock-Service']
+        env['HTTP_X_PACT_MOCK_SERVICE']
       end
 
     end

data/lib/pact/consumer_contract/request_decorator.rb

@@ -12,13 +12,9 @@ module Pact
     end
 
     def as_json options = {}
-      to_hash
-    end
-
-    def to_hash
       hash = {
         method: request.method,
-        path: request.path,
+        path: path
       }
       hash[:query]   = query   if request.specified?(:query)
       hash[:headers] = headers if request.specified?(:headers)
@@ -30,6 +26,10 @@ module Pact
 
     attr_reader :request
 
+    def path
+      Pact::Reification.from_term(request.path)
+    end
+
     def headers
       Pact::Reification.from_term(request.headers)
     end

data/lib/pact/consumer_contract/response_decorator.rb

@@ -10,10 +10,6 @@ module Pact
     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)

data/lib/pact/mock_service/cli.rb

@@ -13,7 +13,7 @@ module Pact
       method_option :port, aliases: "-p", desc: "Port on which to run the service"
       method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS"
       method_option :log, aliases: "-l", desc: "File to which to log output"
-      method_option :cors_enabled, aliases: "-o", desc: "If true, mocks requests will have access control origin headers set to '*'"
+      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 :consumer, desc: "Consumer name"
       method_option :provider, desc: "Provider name"
@@ -55,7 +55,7 @@ module Pact
 
       def call_shutdown_hooks
         begin
-          mock_service.write_pact_if_configured
+          mock_service.shutdown
         rescue StandardError => e
           $stderr.puts "Error writing pact on shutdown. #{e.class} - #{e.message}"
           $stderr.puts e.backtrace.join("\n")
@@ -68,7 +68,7 @@ module Pact
           pact_dir: options[:pact_dir],
           consumer: options[:consumer],
           provider: options[:provider],
-          cors_enabled: options[:cors_enabled]
+          cors_enabled: options[:cors]
         }
         service_options[:log_file] = open_log_file if options[:log]
         service_options

data/lib/pact/mock_service/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module MockService
-    VERSION = "0.2.3.pre.rc2"
+    VERSION = "0.2.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-mock_service
 version: !ruby/object:Gem::Version
-  version: 0.2.3.pre.rc2
+  version: 0.2.3
 platform: ruby
 authors:
 - James Fraser
@@ -12,230 +12,230 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-01-20 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.1.1
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.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: 
@@ -250,17 +250,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
-- Gemfile
-- LICENSE.txt
-- README.md
 - bin/pact-mock-service
 - lib/pact/consumer/app_manager.rb
 - lib/pact/consumer/interactions_filter.rb
-- lib/pact/consumer/mock_service.rb
 - lib/pact/consumer/mock_service/actual_interactions.rb
 - lib/pact/consumer/mock_service/app.rb
 - lib/pact/consumer/mock_service/candidate_interactions.rb
+- lib/pact/consumer/mock_service/cors_origin_header_middleware.rb
 - lib/pact/consumer/mock_service/expected_interactions.rb
 - lib/pact/consumer/mock_service/interaction_delete.rb
 - lib/pact/consumer/mock_service/interaction_mismatch.rb
@@ -276,6 +272,7 @@ files:
 - lib/pact/consumer/mock_service/verification_get.rb
 - lib/pact/consumer/mock_service/verified_interactions.rb
 - lib/pact/consumer/mock_service/web_request_administration.rb
+- lib/pact/consumer/mock_service.rb
 - lib/pact/consumer/mock_service_client.rb
 - lib/pact/consumer/server.rb
 - lib/pact/consumer_contract/consumer_contract_decorator.rb
@@ -283,12 +280,16 @@ 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/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
+- lib/pact/mock_service.rb
+- Gemfile
+- LICENSE.txt
+- README.md
+- CHANGELOG.md
 homepage: https://github.com/bethesque/pact-mock_service
 licenses:
 - MIT
@@ -299,17 +300,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: 1.3.1
+      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