pact-mock_service 0.2.2 → 0.2.3.pre.rc1

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

@@ -0,0 +1,46 @@
+module Pact
+  module Consumer
+    class Verification
+
+      def initialize expected_interactions, actual_interactions
+        @expected_interactions = expected_interactions
+        @actual_interactions = actual_interactions
+      end
+
+      def all_matched?
+        interaction_diffs.empty?
+      end
+
+      def interaction_diffs
+        {
+          :missing_interactions => missing_interactions_summaries,
+          :interaction_mismatches => interaction_mismatches_summaries,
+          :unexpected_requests => unexpected_requests_summaries
+        }.each_with_object({}) do | (key, value), hash |
+          hash[key] = value if value.any?
+        end
+      end
+
+      def missing_interactions_summaries
+        missing_interactions.collect(&:request).collect(&:method_and_path)
+      end
+
+      def interaction_mismatches_summaries
+        actual_interactions.interaction_mismatches.collect(&:short_summary)
+      end
+
+      def unexpected_requests_summaries
+        actual_interactions.unexpected_requests.collect(&:method_and_path)
+      end
+
+      def missing_interactions
+        expected_interactions - actual_interactions.matched_interactions - @actual_interactions.interaction_mismatches.collect(&:candidate_interactions).flatten
+      end
+
+      private
+
+      attr_reader :expected_interactions, :actual_interactions
+
+    end
+  end
+end

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

@@ -5,11 +5,11 @@ module Pact
     class VerificationGet < MockServiceAdministrationEndpoint
 
       include RackRequestHelper
-      attr_accessor :interaction_list, :log_description
 
-      def initialize name, logger, interaction_list, log_description
+      def initialize name, logger, expected_interactions, actual_interactions, log_description
         super name, logger
-        @interaction_list = interaction_list
+        @expected_interactions = expected_interactions
+        @actual_interactions = actual_interactions
         @log_description = log_description
       end
 
@@ -22,25 +22,30 @@ module Pact
       end
 
       def respond env
-        if interaction_list.all_matched?
+        verification = Verification.new(expected_interactions, actual_interactions)
+        if verification.all_matched?
           logger.info "Verifying - interactions matched for example \"#{example_description(env)}\""
           [200, {'Content-Type' => 'text/plain'}, ['Interactions matched']]
         else
-          error_message = FailureMessage.new(interaction_list).to_s
+          error_message = FailureMessage.new(verification).to_s
           logger.warn "Verifying - actual interactions do not match expected interactions for example \"#{example_description(env)}\". \n#{error_message}"
           logger.warn error_message
           [500, {'Content-Type' => 'text/plain'}, ["Actual interactions do not match expected interactions for mock #{name}.\n\n#{error_message}See #{log_description} for details."]]
         end
       end
 
+      private
+
+      attr_accessor :expected_interactions, :actual_interactions, :log_description
+
       def example_description env
-        params_hash(env)['example_description']
+        params_hash(env).fetch("example_description", [])[0]
       end
 
       class FailureMessage
 
-        def initialize interaction_list
-          @interaction_list = interaction_list
+        def initialize verification
+          @verification = verification
         end
 
         def to_s
@@ -52,13 +57,13 @@ module Pact
 
         private
 
-        attr_reader :interaction_list
+        attr_reader :verification
 
         def titles_and_summaries
           {
-            "Incorrect requests" => interaction_list.interaction_mismatches_summaries,
-            "Missing requests" => interaction_list.missing_interactions_summaries,
-            "Unexpected requests" => interaction_list.unexpected_requests_summaries,
+            "Incorrect requests" => verification.interaction_mismatches_summaries,
+            "Missing requests" => verification.missing_interactions_summaries,
+            "Unexpected requests" => verification.unexpected_requests_summaries,
           }
         end
 

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

@@ -0,0 +1,18 @@
+module Pact
+  module Consumer
+    class VerifiedInteractions < Array
+
+      def << interaction
+        unless find_matching_description_and_provider_state interaction
+          super
+        end
+      end
+
+      def find_matching_description_and_provider_state interaction
+        find do |candidate_interaction|
+          candidate_interaction.matches_criteria?(description: interaction.description, provider_state: interaction.provider_state)
+        end
+      end
+    end
+  end
+end

data/lib/pact/consumer/mock_service_client.rb

@@ -12,12 +12,12 @@ module Pact
       end
 
       def verify example_description
-        response = http.request_get("/interactions/verification?example_description=#{URI.encode(example_description)}", MOCK_SERVICE_ADMINISTRATON_HEADERS)
+        response = http.request_get("/interactions/verification?example_description=#{CGI.escape(example_description)}", MOCK_SERVICE_ADMINISTRATON_HEADERS)
         raise "\e[31m#{response.body}\e[m" unless response.is_a? Net::HTTPSuccess
       end
 
       def log msg
-        http.request_get("/log?msg=#{URI.encode(msg)}", MOCK_SERVICE_ADMINISTRATON_HEADERS)
+        http.request_get("/log?msg=#{CGI.escape(msg)}", MOCK_SERVICE_ADMINISTRATON_HEADERS)
       end
 
       def wait_for_interactions wait_max_seconds, poll_interval
@@ -28,7 +28,7 @@ module Pact
       end
 
       def clear_interactions example_description
-        http.delete("/interactions?example_description=#{URI.encode(example_description)}", MOCK_SERVICE_ADMINISTRATON_HEADERS)
+        http.delete("/interactions?example_description=#{CGI.escape(example_description)}", MOCK_SERVICE_ADMINISTRATON_HEADERS)
       end
 
       def add_expected_interaction interaction
@@ -41,7 +41,7 @@ module Pact
       end
 
       def self.clear_interactions port, example_description
-        Net::HTTP.new("localhost", port).delete("/interactions?example_description=#{URI.encode(example_description)}", MOCK_SERVICE_ADMINISTRATON_HEADERS)
+        Net::HTTP.new("localhost", port).delete("/interactions?example_description=#{CGI.escape(example_description)}", MOCK_SERVICE_ADMINISTRATON_HEADERS)
       end
 
       def write_pact pacticipant_details

data/lib/pact/consumer/server.rb

@@ -63,6 +63,8 @@ module Pact
       end
     rescue SystemCallError
       return false
+    rescue EOFError
+      return false
     end
 
     def run_default_server(app, port)

data/lib/pact/consumer_contract/consumer_contract_writer.rb

@@ -4,6 +4,7 @@ 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'
+require 'fileutils'
 
 module Pact
 
@@ -45,6 +46,7 @@ module Pact
 
     def update_pactfile
       logger.debug "Updating pact file for #{provider_name} at #{pactfile_path}"
+      FileUtils.mkdir_p File.dirname(pactfile_path)
       File.open(pactfile_path, 'w') do |f|
         f.write pact_json
       end

data/lib/pact/mock_service/cli.rb

@@ -1,47 +1,54 @@
 require 'find_a_port'
 require 'thor'
 require 'thwait'
+require 'webrick/https'
 require 'rack/handler/webrick'
-
-# TODO rename CLI so as not to clash
+require 'fileutils'
 
 module Pact
   module MockService
     class CLI < Thor
 
-      desc 'service', "Start a mock service"
+      desc 'execute', "Start a mock service"
       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 :quiet, aliases: "-q", desc: "If true, no admin messages will be shown"
+      method_option :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written"
 
-      def service
+      def execute
         RunStandaloneMockService.call(options)
       end
 
-      default_task :service
-
-      private
+      default_task :execute
 
-      def log message
-        puts message unless options[:quiet]
-      end
     end
 
     class RunStandaloneMockService
 
       def self.call options
         require 'pact/consumer/mock_service/app'
-        service_options = {}
+        service_options = {pact_dir: options[:pact_dir]}
         if options[:log]
+          FileUtils.mkdir_p File.dirname(options[:log])
           log = File.open(options[:log], 'w')
           log.sync = true
           service_options[:log_file] = log
         end
 
-        port = options[:port] || FindAPort.available_port
         mock_service = Pact::Consumer::MockService.new(service_options)
         trap(:INT) { Rack::Handler::WEBrick.shutdown }
-        Rack::Handler::WEBrick.run(mock_service, :Port => port, :AccessLog => [])
+        trap(:TERM) { Rack::Handler::WEBrick.shutdown }
+
+        webbrick_opts = {
+          :Port => options[:port] || FindAPort.available_port,
+          :AccessLog => []
+        }
+
+        webbrick_opts.merge!({
+          :SSLEnable => true,
+          :SSLCertName => [ %w[CN localhost] ] }) if options[:ssl]
+
+        Rack::Handler::WEBrick.run(mock_service, webbrick_opts)
       end
     end
 

data/lib/pact/mock_service/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module MockService
-    VERSION = "0.2.2"
+    VERSION = "0.2.3-rc1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-mock_service
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3.pre.rc1
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2015-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -70,20 +70,6 @@ dependencies:
     - - "~>"
       - !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
@@ -264,21 +250,19 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - 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/expected_interactions.rb
 - lib/pact/consumer/mock_service/interaction_delete.rb
-- lib/pact/consumer/mock_service/interaction_list.rb
 - lib/pact/consumer/mock_service/interaction_mismatch.rb
 - lib/pact/consumer/mock_service/interaction_post.rb
 - lib/pact/consumer/mock_service/interaction_replay.rb
@@ -287,7 +271,9 @@ files:
 - lib/pact/consumer/mock_service/mock_service_administration_endpoint.rb
 - lib/pact/consumer/mock_service/pact_post.rb
 - lib/pact/consumer/mock_service/rack_request_helper.rb
+- lib/pact/consumer/mock_service/verification.rb
 - lib/pact/consumer/mock_service/verification_get.rb
+- lib/pact/consumer/mock_service/verified_interactions.rb
 - lib/pact/consumer/mock_service_client.rb
 - lib/pact/consumer/server.rb
 - lib/pact/consumer_contract/consumer_contract_decorator.rb
@@ -301,57 +287,6 @@ files:
 - 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/features/mock_multiple_responses_spec.rb
-- spec/features/mock_response_spec.rb
-- spec/lib/pact/consumer/app_manager_spec.rb
-- spec/lib/pact/consumer/mock_service/app_spec.rb
-- spec/lib/pact/consumer/mock_service/interaction_list_spec.rb
-- spec/lib/pact/consumer/mock_service/interaction_mismatch_spec.rb
-- spec/lib/pact/consumer/mock_service/interaction_replay_spec.rb
-- 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/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
-- 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
-- spec/support/active_support_if_configured.rb
-- spec/support/app_for_config_ru.rb
-- spec/support/case-insensitive-response-header-matching.json
-- spec/support/case-insensitive-response-header-matching.rb
-- spec/support/consumer_contract_template.json
-- spec/support/dsl_spec_support.rb
-- spec/support/factories.rb
-- spec/support/generated_index.md
-- spec/support/generated_markdown.md
-- spec/support/interaction_view_model.json
-- spec/support/interaction_view_model_with_terms.json
-- spec/support/markdown_pact.json
-- spec/support/missing_provider_states_output.txt
-- spec/support/options.json
-- 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
-- spec/support/term.json
-- spec/support/test_app_fail.json
-- spec/support/test_app_pass.json
-- spec/support/test_app_with_right_content_type_differ.json
-- tasks/spec.rake
 homepage: https://github.com/bethesque/pact-mock_service
 licenses:
 - MIT
@@ -367,62 +302,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Provides a mock service for use with Pact
-test_files:
-- spec/features/mock_multiple_responses_spec.rb
-- spec/features/mock_response_spec.rb
-- spec/lib/pact/consumer/app_manager_spec.rb
-- spec/lib/pact/consumer/mock_service/app_spec.rb
-- spec/lib/pact/consumer/mock_service/interaction_list_spec.rb
-- spec/lib/pact/consumer/mock_service/interaction_mismatch_spec.rb
-- spec/lib/pact/consumer/mock_service/interaction_replay_spec.rb
-- 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/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
-- 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
-- spec/support/active_support_if_configured.rb
-- spec/support/app_for_config_ru.rb
-- spec/support/case-insensitive-response-header-matching.json
-- spec/support/case-insensitive-response-header-matching.rb
-- spec/support/consumer_contract_template.json
-- spec/support/dsl_spec_support.rb
-- spec/support/factories.rb
-- spec/support/generated_index.md
-- spec/support/generated_markdown.md
-- spec/support/interaction_view_model.json
-- spec/support/interaction_view_model_with_terms.json
-- spec/support/markdown_pact.json
-- spec/support/missing_provider_states_output.txt
-- spec/support/options.json
-- 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
-- spec/support/term.json
-- spec/support/test_app_fail.json
-- spec/support/test_app_pass.json
-- spec/support/test_app_with_right_content_type_differ.json
+test_files: []

data/.gitignore

@@ -1,30 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-InstalledFiles
-_yardoc
-coverage
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.swp
-.bin
-tags
-.rbenv-version
-spec/pacts
-.rvmrc
-*.iml
-.rakeTasks
-*~
-.ruby-gemset
-.ruby-version
-log
-.idea
-reports
-Gemfile.lock

data/.rspec

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

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
-  - jruby-19mode
-  - jruby-1.7.11
-  - jruby-1.7.12

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-
-Dir.glob('./lib/tasks/**/*.rake').each { |task| load task }
-Dir.glob('./tasks/**/*.rake').each { |task| load task }
-
-

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

@@ -1,76 +0,0 @@
-module Pact
-  module Consumer
-    class InteractionList
-
-      attr_reader :interactions
-      attr_reader :unexpected_requests
-      attr_reader :interaction_mismatches
-
-      def initialize
-        clear
-      end
-
-      # For testing, sigh
-      def clear
-        @interactions = []
-        @matched_interactions = []
-        @interaction_mismatches = []
-        @unexpected_requests = []
-      end
-
-      def add interactions
-        @interactions << interactions
-      end
-
-      def register_matched interaction
-        @matched_interactions << interaction
-      end
-
-      def register_unexpected_request request
-        @unexpected_requests << request
-      end
-
-      def register_interaction_mismatch interaction_mismatch
-        @interaction_mismatches << interaction_mismatch
-      end
-
-      def all_matched?
-        interaction_diffs.empty?
-      end
-
-      def missing_interactions
-        @interactions - @matched_interactions - @interaction_mismatches.collect(&:candidate_interactions).flatten
-      end
-
-      def missing_interactions_summaries
-        missing_interactions.collect(&:request).collect(&:method_and_path)
-      end
-
-      def interaction_mismatches_summaries
-        interaction_mismatches.collect(&:short_summary)
-      end
-
-      def unexpected_requests_summaries
-        unexpected_requests.collect(&:method_and_path)
-      end
-
-      def interaction_diffs
-        {
-          :missing_interactions => missing_interactions_summaries,
-          :interaction_mismatches => interaction_mismatches_summaries,
-          :unexpected_requests => unexpected_requests_summaries
-        }.inject({}) do | hash, pair |
-          hash[pair.first] = pair.last if pair.last.any?
-          hash
-        end
-      end
-
-      def find_candidate_interactions actual_request
-        interactions.select do | interaction |
-          interaction.request.matches_route? actual_request
-        end
-      end
-
-    end
-  end
-end

data/pact-mock-service.gemspec

@@ -1,39 +0,0 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'pact/mock_service/version'
-
-Gem::Specification.new do |gem|
-  gem.name          = "pact-mock_service"
-  gem.version       = Pact::MockService::VERSION
-  gem.authors       = ["James Fraser", "Sergei Matheson", "Brent Snook", "Ronald Holshausen", "Beth Skurrie"]
-  gem.email         = ["james.fraser@alumni.swinburne.edu", "sergei.matheson@gmail.com", "brent@fuglylogic.com", "uglyog@gmail.com", "bskurrie@dius.com.au"]
-  gem.summary       = %q{Provides a mock service for use with Pact}
-  gem.homepage      = "https://github.com/bethesque/pact-mock_service"
-
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
-  gem.license       = 'MIT'
-
-  gem.add_runtime_dependency 'rack'
-  gem.add_runtime_dependency 'rspec', '>=2.14'
-  gem.add_runtime_dependency 'find_a_port', '~> 1.0.1'
-  gem.add_runtime_dependency 'rack-test', '~> 0.6.2'
-  gem.add_runtime_dependency 'awesome_print', '~> 1.1'
-  gem.add_runtime_dependency 'thor'
-  gem.add_runtime_dependency 'json' #Not locking down a version because buncher gem requires 1.6, while other projects use 1.7.
-  gem.add_runtime_dependency 'webrick'
-  gem.add_runtime_dependency 'term-ansicolor', '~> 1.0'
-
-  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'
-  gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'fakefs', '~> 0.4'
-  gem.add_development_dependency 'hashie', '~> 2.0'
-  gem.add_development_dependency 'activesupport'
-  gem.add_development_dependency 'faraday'
-end