pacto 0.4.0.rc1 → 0.4.0.rc2

data/lib/pacto/response_clause.rb

@@ -1,8 +1,8 @@
 # -*- encoding : utf-8 -*-
 module Pacto
-  class ResponseClause < Pacto::Dash
-    property :status
-    property :headers, default: {}
-    property :schema, default: {}
+  module ResponseClause
+    attr_reader :status
+    attr_reader :headers
+    attr_reader :schema
   end
 end

data/lib/pacto/server.rb

@@ -1,4 +1,43 @@
 # -*- encoding : utf-8 -*-
-require 'goliath'
+require 'reel'
 require 'pacto'
-require 'pacto/server/api'
+require_relative 'server/settings'
+require_relative 'server/proxy'
+
+module Pacto
+  module Server
+    class HTTP < Reel::Server::HTTP
+      attr_reader :settings, :logger
+      include Proxy
+
+      def initialize(host = '127.0.0.1', port = 3000, options = {})
+        @logger = options[:pacto_logger] || Pacto.configuration.logger
+        @settings = Settings::OptionHandler.new(port, @logger).handle(options)
+        logger.info "Pacto Server starting on #{host}:#{port}"
+        super(host, port, spy: options[:spy], &method(:on_connection))
+      end
+
+      def on_connection(connection)
+        # Support multiple keep-alive requests per connection
+        connection.each_request do |reel_request|
+          begin
+            pacto_request = # exclusive do
+              Pacto::PactoRequest.new(
+                headers: reel_request.headers, body: reel_request.read,
+                method: reel_request.method, uri: Addressable::URI.heuristic_parse(reel_request.uri)
+              )
+            # end
+
+            pacto_response = proxy_request(pacto_request)
+            reel_response = ::Reel::Response.new(pacto_response.status, pacto_response.headers, pacto_response.body)
+            reel_request.respond(reel_response)
+          rescue WebMock::NetConnectNotAllowedError, Faraday::ConnectionFailed => e
+            reel_request.respond 502, e.message
+          rescue => e
+            reel_request.respond 500, Pacto::Errors.formatted_trace(e)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pacto/stubs/uri_pattern.rb

@@ -3,14 +3,15 @@ module Pacto
   class UriPattern
     class << self
       def for(request, strict = Pacto.configuration.strict_matchers)
-        fix_deprecations(request)
+        fail_deprecations(request)
 
         build_template_uri_pattern(request, strict)
       end
 
       def build_template_uri_pattern(request, strict)
         path = request.path.respond_to?(:pattern) ? request.path.pattern : request.path
-        host = request.host ||= '{server}'
+        host = request.host
+        host ||= '{server}'
         scheme, host = host.split('://') if host.include?('://')
         scheme ||= '{scheme}'
 
@@ -21,12 +22,11 @@ module Pacto
         end
       end
 
-      def fix_deprecations(request)
+      def fail_deprecations(request)
         return if request.path.is_a? Addressable::Template
         return if request.path == (corrected_path = request.path.gsub(/\/:(\w+)/, '/{\\1}'))
 
-        Pacto::UI.deprecation "Please change path #{request.path} to uri template: #{corrected_path}"
-        request.path = Addressable::Template.new(corrected_path)
+        fail "please change path #{request.path} to uri template: #{corrected_path} - old syntax no longer supported"
       end
     end
   end

data/lib/pacto/stubs/webmock_adapter.rb

@@ -55,7 +55,10 @@ module Pacto
         uri_pattern = UriPattern.for(request_clause)
         stub = WebMock.stub_request(request_clause.http_method, uri_pattern)
 
-        stub.request_pattern.with(strict_details(request_clause)) if Pacto.configuration.strict_matchers
+        if Pacto.configuration.strict_matchers
+          with_opts = strict_details(request_clause)
+          stub.request_pattern.with(with_opts) unless with_opts.empty?
+        end
 
         stub.to_return do |request|
           pacto_request = Pacto::Adapters::WebMock::PactoRequest.new request

data/lib/pacto/test_helper.rb

@@ -1,15 +1,13 @@
 # -*- encoding : utf-8 -*-
 begin
   require 'pacto'
-  require 'goliath/test_helper'
   require 'pacto/server'
 rescue LoadError
-  raise 'pacto/test_helper requires the goliath and pacto-server gems'
+  raise 'pacto/test_helper requires the pacto-server gem'
 end
 
 module Pacto
   module TestHelper
-    include Goliath::TestHelper
     DEFAULT_ARGS = {
       stdout: true,
       log_file: 'pacto.log',
@@ -20,18 +18,23 @@ module Pacto
       generate: false,
       verbose: true,
       validate: true,
-      directory: File.join(Dir.pwd, 'spec', 'fixtures', 'contracts'),
-      port: 9000
+      directory: File.join(Dir.pwd, 'contracts'),
+      port: 9000,
+      format: :legacy,
+      stenographer_log_file: File.expand_path('pacto_stenographer.log', Dir.pwd),
+      strip_port: true
     }
 
-    def with_pacto(args = DEFAULT_ARGS)
-      args = DEFAULT_ARGS.merge args
-      with_api(Pacto::Server::API, args) do
-        EM::Synchrony.defer do
-          yield "http://localhost:#{@test_server_port}"
-          EM.stop
-        end
-      end
+    def with_pacto(args = {})
+      start_index = ::Pacto::InvestigationRegistry.instance.investigations.size
+      ::Pacto::InvestigationRegistry.instance.investigations.clear
+      args = DEFAULT_ARGS.merge(args)
+      args[:spy] = args[:verbose]
+      server = Pacto::Server::HTTP.supervise('0.0.0.0', args[:port], args)
+      yield "http://localhost:#{args[:port]}"
+      ::Pacto::InvestigationRegistry.instance.investigations[start_index, -1]
+    ensure
+      server.terminate unless server.nil?
     end
   end
 end

data/lib/pacto/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Pacto
-  VERSION = '0.4.0.rc1'
+  VERSION = '0.4.0.rc2'
 end

data/pacto-server.gemspec

@@ -18,7 +18,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency 'pacto', Pacto::VERSION
-  gem.add_dependency 'goliath', '~> 1.0'
-  gem.add_dependency 'em-synchrony', '~> 1.0'
-  gem.add_dependency 'em-http-request', '~> 1.1'
+  gem.add_dependency 'reel', '~> 0.5'
 end

data/pacto.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(/^(test|spec|features)\//)
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'webmock', '~> 1.18', '< 1.20.3'
+  gem.add_dependency 'webmock', '~> 1.18'
   gem.add_dependency 'swagger-core', '~> 0.2', '>= 0.2.1'
   gem.add_dependency 'middleware', '~> 0.1'
   gem.add_dependency 'multi_json', '~> 1.8'

data/sample_apis/user_api.rb

@@ -0,0 +1,16 @@
+# -*- encoding : utf-8 -*-
+# A siple JSON service to demonstrate request/response bodies
+
+require 'securerandom'
+
+module DummyServices
+  class Echo < Grape::API
+    format :json
+
+    post '/users' do
+      user = env['api.request.body']
+      user[:id] = SecureRandom.uuid
+      user
+    end
+  end
+end

data/samples/contracts/user.json

@@ -0,0 +1,51 @@
+{
+  "name": "User",
+  "request": {
+    "headers": {
+      "Content-Type": "application/json"
+    },
+    "http_method": "post",
+    "path": "/api/users",
+    "schema": {
+      "$schema": "http://json-schema.org/draft-03/schema#",
+      "type": "object",
+      "properties": {
+        "firstName": {"type": "string", "required": true},
+        "lastName": {"type": "string", "required": true}
+      }
+    }
+  },
+  "response": {
+    "status": 201,
+    "schema": {
+      "$schema": "http://json-schema.org/draft-03/schema#",
+      "type": "object",
+      "properties": {
+        "id": { "type": "string", "required": true },
+        "firstName": {"type": "string", "required": true},
+        "lastName": {"type": "string", "required": true}
+      }
+    }
+  },
+  "examples": {
+    "max": {
+      "request": {
+        "headers": {
+          "Content-Type": "application/json"
+        },
+        "body": {
+          "firstName": "Max",
+          "lastName": "Lincoln"
+        }
+      },
+      "response": {
+        "body": {
+          "id": "026ed411-6d12-4a76-a3c7-19758a872455",
+          "firstName": "Max",
+          "lastName": "Lincoln"
+        }
+      }
+    }
+  }
+}
+

data/samples/cops.rb

@@ -1,5 +1,8 @@
 # -*- encoding : utf-8 -*-
+require 'rspec'
+require 'rspec/autorun'
 require 'pacto'
+
 Pacto.configure do |c|
   c.contracts_path = 'contracts'
 end

data/samples/server_cli.sh

@@ -6,7 +6,7 @@ bundle exec pacto-server -h
 
 # You probably want to run with the -sv option, which will display verbose output to stdout. You can
 # run server that proxies to a live endpoint:
-bundle exec pacto-server -sv --port 9000 --live http://example.com &
-bundle exec pacto-server -sv --port 9001 --stub &
+bundle exec pacto proxy --port 9000 --to http://example.com &
+bundle exec pacto stub --port 9001 &
 
-pkill -f pacto-server
+pkill -f 'pacto server'

data/spec/fabricators/contract_fabricator.rb

@@ -3,9 +3,16 @@ require 'pacto'
 require 'hashie/mash'
 
 # Fabricators for contracts or parts of contracts
+unless defined? PACTO_DEFAULT_FORMAT
+  PACTO_DEFAULT_FORMAT = (ENV['PACTO_DEFAULT_FORMAT'] || 'legacy')
+  CONTRACT_CLASS = Pacto::Formats.const_get(PACTO_DEFAULT_FORMAT.capitalize).const_get('Contract')
+  REQUEST_CLAUSE_CLASS = Pacto::Formats.const_get(PACTO_DEFAULT_FORMAT.capitalize).const_get('RequestClause')
+  RESPONSE_CLAUSE_CLASS = Pacto::Formats.const_get(PACTO_DEFAULT_FORMAT.capitalize).const_get('ResponseClause')
+end
+
+Fabricator(:contract, from: CONTRACT_CLASS) do
+  initialize_with { @_klass.new(to_hash.merge(skip_freeze: true)) } # Hash based initialization
 
-Fabricator(:contract, from: Pacto::Contract) do
-  initialize_with { @_klass.new to_hash } # Hash based initialization
   transient example_count: 0
   name { 'Dummy Contract' }
   file { 'file:///does/not/exist/dummy_contract.json' }
@@ -23,17 +30,19 @@ Fabricator(:contract, from: Pacto::Contract) do
       nil
     end
   end
+
+  # after_save { | contract, _transients | contract.freeze }
 end
 
-Fabricator(:partial_contract, from: Pacto::Contract) do
-  initialize_with { @_klass.new to_hash } # Hash based initialization
+Fabricator(:partial_contract, from: CONTRACT_CLASS) do
+  initialize_with { @_klass.new(to_hash.merge(skip_freeze: true)) } # Hash based initialization
   name { 'Dummy Contract' }
   file { 'file:///does/not/exist/dummy_contract.json' }
   request { Fabricate(:request_clause).to_hash }
 end
 
-Fabricator(:request_clause, from: Pacto::RequestClause) do
-  initialize_with { @_klass.new to_hash } # Hash based initialization
+Fabricator(:request_clause, from: REQUEST_CLAUSE_CLASS) do
+  initialize_with { @_klass.new(to_hash.merge(skip_freeze: true)) } # Hash based initialization
   host { 'example.com' }
   http_method { 'GET' }
   path { '/abcd' }
@@ -49,8 +58,8 @@ Fabricator(:request_clause, from: Pacto::RequestClause) do
   params {}
 end
 
-Fabricator(:response_clause, from: Pacto::ResponseClause) do
-  initialize_with { @_klass.new to_hash } # Hash based initialization
+Fabricator(:response_clause, from: RESPONSE_CLAUSE_CLASS) do
+  initialize_with { @_klass.new(to_hash.merge(skip_freeze: true)) } # Hash based initialization
   status { 200 }
   headers do
     {

data/spec/fixtures/{deprecated_contracts → contracts/deprecated}/deprecated_contract.json

@@ -1,7 +1,7 @@
 {
   "request": {
     "method": "GET",
-    "path": "/hello",
+    "path": "/hello/:id",
     "headers": {
       "Accept": "application/json"
     },
@@ -20,4 +20,4 @@
       }
     }
   }
-}
+}

data/spec/fixtures/contracts/{simple_contract.json → legacy/simple_contract.json}

@@ -2,7 +2,7 @@
   "name": "Simple Contract",
   "request": {
     "http_method": "GET",
-    "path": "/hello",
+    "path": "/api/hello",
     "headers": {
       "Accept": "application/json"
     },

data/spec/integration/e2e_spec.rb

@@ -1,20 +1,14 @@
 # -*- encoding : utf-8 -*-
 describe Pacto do
-  let(:contract_path) { 'spec/fixtures/contracts/simple_contract.json' }
-  let(:strict_contract_path) { 'spec/fixtures/contracts/strict_contract.json' }
+  let(:contract_path) { contract_file 'simple_contract' }
+  let(:strict_contract_path) { contract_file 'strict_contract' }
 
   before :all do
     WebMock.allow_net_connect!
   end
 
   context 'Contract investigation' do
-    around :each do |example|
-      run_pacto do
-        example.run
-      end
-    end
-
-    it 'verifies the contract against a producer' do
+    xit 'verifies the contract against a producer' do
       # FIXME: Does this really test what it says it does??
       contract = described_class.load_contracts(contract_path, 'http://localhost:8000')
       expect(contract.simulate_consumers.map(&:successful?).uniq).to eq([true])
@@ -26,7 +20,7 @@ describe Pacto do
       contracts = described_class.load_contracts(contract_path, 'http://dummyprovider.com')
       contracts.stub_providers
 
-      response = get_json('http://dummyprovider.com/hello')
+      response = get_json('http://dummyprovider.com/api/hello')
       expect(response['message']).to eq 'bar'
     end
   end
@@ -38,10 +32,10 @@ describe Pacto do
         c.register_hook Pacto::Hooks::ERBHook.new
       end
 
-      contracts = described_class.load_contracts 'spec/fixtures/contracts/', 'http://dummyprovider.com'
+      contracts = described_class.load_contracts contracts_folder, 'http://dummyprovider.com'
       contracts.stub_providers(device_id: 42)
 
-      login_response = get_json('http://dummyprovider.com/hello')
+      login_response = get_json('http://dummyprovider.com/api/hello')
       expect(login_response.keys).to eq ['message']
       expect(login_response['message']).to be_kind_of(String)
 

data/spec/integration/forensics/integration_matcher_spec.rb

@@ -3,14 +3,8 @@ require 'pacto/rspec'
 
 module Pacto
   describe '#have_investigated' do
-    let(:contract_path) { 'spec/fixtures/contracts/simple_contract.json' }
-    let(:strict_contract_path) { 'spec/fixtures/contracts/strict_contract.json' }
-
-    around :each do |example|
-      run_pacto do
-        example.run
-      end
-    end
+    let(:contract_path) { contract_file 'simple_contract' }
+    let(:strict_contract_path) { contract_file 'strict_contract' }
 
     def expect_to_raise(message_pattern = nil, &blk)
       expect { blk.call }.to raise_error(RSpec::Expectations::ExpectationNotMetError, message_pattern)
@@ -32,7 +26,7 @@ module Pacto
 
     context 'successful investigations' do
       let(:contracts) do
-        Pacto.load_contracts 'spec/fixtures/contracts/', 'http://dummyprovider.com'
+        Pacto.load_contracts contracts_folder, 'http://dummyprovider.com'
       end
 
       before(:each) do
@@ -44,7 +38,7 @@ module Pacto
         contracts.stub_providers(device_id: 42)
         Pacto.validate!
 
-        Faraday.get('http://dummyprovider.com/hello') do |req|
+        Faraday.get('http://dummyprovider.com/api/hello') do |req|
           req.headers = { 'Accept' => 'application/json' }
         end
       end
@@ -57,7 +51,7 @@ module Pacto
         # Increasingly strict assertions
         expect(Pacto).to have_investigated('Simple Contract')
         expect(Pacto).to have_investigated('Simple Contract').with_request(headers: hash_including('Accept' => 'application/json'))
-        expect(Pacto).to have_investigated('Simple Contract').with_request(http_method: :get, url: 'http://dummyprovider.com/hello')
+        expect(Pacto).to have_investigated('Simple Contract').with_request(http_method: :get, url: 'http://dummyprovider.com/api/hello')
       end
 
       it 'supports negative assertions' do