pacto 0.4.0.rc1 → 0.4.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6cc06d1907fec1501c7069081e958eaac9068d7
-  data.tar.gz: 4b6dcac0163d858ed9e085c345a3b956b9ad8621
+  metadata.gz: 11c33cac8327c3a1e1bae2bf3bfe80a350590386
+  data.tar.gz: 0a7eb928773e1447537a169076b3802572fc821f
 SHA512:
-  metadata.gz: e980441e1894a466b5818e099f49523cb0d61b5bc414389186ba57bfb143caf4ee59086aa480c8e9d7c78b3f53ceb4a43c2e91ca55cbf76c04a4b696e459659c
-  data.tar.gz: 3611106a78d817d26c98ac7769ac88766f9d0db0f793016066b87e255194466e51340bde66e3509f779e25d92b01e3f9b6d2d2d3b793775ada0f232297438529
+  metadata.gz: 9a4db2ba134723c8b28c11b3f75b902ddc059694e29667d0aae9cbbd25d06dae75ffaee6a4a880439fc0422649d9b110e14d3048bf5089b16b4859d7f676f9f0
+  data.tar.gz: 66fca5589aefe93cf77a44f631fbdaee64d6999b6a50f98e28c701bca51d13daa11f222114e0f6f9616274a986add6885f66f3c73c9c2bc1bb5965b7d91a6ff7

data/.rubocop.yml

@@ -10,7 +10,7 @@ LineLength:
   Enabled: false
 
 MethodLength:
-  Max: 15
+  Max: 20
 
 Style/Encoding:
   EnforcedStyle: when_needed

data/Gemfile

@@ -1,13 +1,8 @@
 source 'https://rubygems.org'
-PACTO_HOME = File.expand_path '..', __FILE__
 
 # Specify your gem's dependencies in pacto.gemspec
-gemspec :name => 'pacto'
-
-Dir["#{PACTO_HOME}/pacto-*.gemspec"].each do |gemspec|
-  plugin = gemspec.scan(/pacto-(.*)\.gemspec/).flatten.first
-  gemspec(:name => "pacto-#{plugin}", :path => PACTO_HOME, :development_group => plugin)
-end
+gemspec name: 'pacto'
+gemspec name: 'pacto-server'
 
 # This is only used by Relish tests.  Putting it here let's travis
 # pre-install so we can speed up the test with `bundle install --local`,

data/Rakefile

@@ -40,11 +40,6 @@ task :samples do
   sh 'bundle exec polytrix generate code2doc --solo=samples --solo-glob="*.{rb,sh}"'
 end
 
-desc 'Build the documentation from the samples'
-task :documentation do
-  sh "docco -t #{Dir.pwd}/docco_embeddable_layout/docco.jst samples/*"
-end
-
 desc 'Build gems into the pkg directory'
 task :build do
   FileUtils.rm_rf('pkg')

data/appveyor.yml

@@ -0,0 +1,12 @@
+version: 0.0.{build}
+init:
+- choco install openssl.light
+- gem install bundler --quiet --no-ri --no-rdoc
+- gem install foreman --quiet --no-ri --no-rdoc
+install:
+- bundle install
+build: off
+test_script:
+- START /B foreman start
+- bundle exec rake
+

data/features/configuration/strict_matchers.feature

@@ -18,7 +18,7 @@ Feature: Strict Matching
       {
         "request": {
           "http_method": "GET",
-          "path": "/hello/:id",
+          "path": "/hello/{id}",
           "headers": {
             "Accept": "application/json"
           },
@@ -64,7 +64,7 @@ Feature: Strict Matching
       end
 
       print 'Exact: '
-      puts response 'http://dummyprovider.com/hello/:id', headers: {'Accept' => 'application/json' }
+      puts response URI.encode('http://dummyprovider.com/hello/{id}'), headers: {'Accept' => 'application/json' }
 
       print 'Wrong headers: '
       puts response 'http://dummyprovider.com/hello/123', headers: {'Content-Type' => 'application/json' }
@@ -79,7 +79,7 @@ Feature: Strict Matching
       """
       Pacto.configuration.strict_matchers = true
 
-      Exact: WebMock::NetConnectNotAllowedError
+      Exact: {"message":"Hello, world!"}
       Wrong headers: WebMock::NetConnectNotAllowedError
       ID placeholder: {"message":"Hello, world!"}
 
@@ -91,7 +91,7 @@ Feature: Strict Matching
       """
       Pacto.configuration.strict_matchers = false
 
-      Exact: WebMock::NetConnectNotAllowedError
+      Exact: {"message":"Hello, world!"}
       Wrong headers: {"message":"Hello, world!"}
       ID placeholder: {"message":"Hello, world!"}
       """

data/features/generate/generation.feature

@@ -10,10 +10,10 @@ Feature: Contract Generation
   Background:
     Given a file named "requests/my_contract.json" with:
     """
-        {
+      {
         "request": {
           "http_method": "GET",
-          "path": "/hello",
+          "path": "/api/ping",
           "headers": {
             "Accept": "application/json"
           }
@@ -29,7 +29,7 @@ Feature: Contract Generation
 
   Scenario: Generating a contract using the rake task
     Given a directory named "contracts"
-    When I successfully run `bundle exec rake pacto:generate['tmp/aruba/requests','tmp/aruba/contracts','http://localhost:8000']`
+    When I successfully run `bundle exec rake pacto:generate['tmp/aruba/requests','tmp/aruba/contracts','http://localhost:5000']`
     Then the stdout should contain "Successfully generated all contracts"
 
   Scenario: Generating a contract programmatically
@@ -40,25 +40,23 @@ Feature: Contract Generation
 
     WebMock.allow_net_connect!
     generator = Pacto::Generator.contract_generator
-    contract = generator.generate_from_partial_contract('requests/my_contract.json', 'http://localhost:8000')
+    contract = generator.generate_from_partial_contract('requests/my_contract.json', 'http://localhost:5000')
     puts contract
     """
     When I successfully run `bundle exec ruby generate.rb`
     Then the stdout should match this contract:
     """json
     {
-      "name": "/hello",
+      "name": "/api/ping",
       "request": {
         "headers": {
-          "Accept": "application/json"
         },
         "http_method": "get",
-        "path": "/hello"
+        "path": "/api/ping"
       },
       "response": {
         "headers": {
-          "Content-Type": "application/json",
-          "Vary": "Accept"
+          "Content-Type": "application/json"
         },
         "status": 200,
         "schema": {
@@ -67,7 +65,7 @@ Feature: Contract Generation
           "type": "object",
           "required": true,
           "properties": {
-            "message": {
+            "ping": {
               "type": "string",
               "required": true
             }

data/features/support/env.rb

@@ -5,7 +5,6 @@ require 'aruba/cucumber'
 require 'json_spec/cucumber'
 require 'aruba/jruby' if RUBY_PLATFORM == 'java'
 require 'pacto/test_helper'
-require_relative '../../spec/pacto/dummy_server'
 
 Pacto.configuration.hide_deprecations = true
 
@@ -16,7 +15,6 @@ end
 
 class PactoWorld
   include Pacto::TestHelper
-  include Pacto::DummyServer::JRubyWorkaroundHelper
 end
 
 World do
@@ -24,11 +22,9 @@ World do
 end
 
 Around do | _scenario, block |
-  # This is a cucumber bug (see cucumber #640)
+  WebMock.allow_net_connect!
   world = self || PactoWorld.new
-  world.run_pacto do
-    Bundler.with_clean_env do
-      block.call
-    end
+  world.with_pacto(port: 8000, live: true, backend_host: 'http://localhost:5000') do
+    block.call
   end
 end

data/features/validate/validation.feature

@@ -8,7 +8,7 @@ Feature: Validation
           {
           "request": {
             "http_method": "GET",
-            "path": "/hello",
+            "path": "/api/hello",
             "headers": { "Accept": "application/json" },
             "params": {}
           },
@@ -26,10 +26,10 @@ Feature: Validation
           }
         }
       """
-      When I successfully run `bundle exec rake pacto:validate['http://localhost:8000','tmp/aruba/contracts/simple_contract.json']`
+      When I successfully run `bundle exec rake pacto:validate['http://localhost:5000','tmp/aruba/contracts/simple_contract.json']`
       Then the stdout should contain:
         """"
-        Validating contracts against host http://localhost:8000
+        Validating contracts against host http://localhost:5000
                  OK!  simple_contract.json
         1 valid contract
         """

data/lib/pacto.rb

@@ -13,9 +13,10 @@ require 'ostruct'
 require 'erb'
 require 'logger'
 
+# FIXME: There's soo much stuff here! I'd both like to re-roganize and to use autoloading.
+require 'pacto/errors'
 require 'pacto/dash'
 require 'pacto/resettable'
-require 'pacto/exceptions/invalid_contract.rb'
 require 'pacto/logger'
 require 'pacto/ui'
 require 'pacto/request_pattern'
@@ -26,6 +27,7 @@ require 'pacto/consumer'
 require 'pacto/provider'
 require 'pacto/actors/json_generator'
 require 'pacto/actors/from_examples'
+require 'pacto/body_parsing'
 require 'pacto/core/pacto_request'
 require 'pacto/core/pacto_response'
 require 'pacto/core/contract_registry'
@@ -46,7 +48,6 @@ require 'pacto/investigation'
 require 'pacto/hooks/erb_hook'
 require 'pacto/observers/stenographer'
 require 'pacto/generator'
-require 'pacto/generator/filters'
 require 'pacto/contract_files'
 require 'pacto/contract_set'
 require 'pacto/uri'
@@ -96,11 +97,11 @@ module Pacto
       true
     end
 
-    def load_contract(contract_path, host, format = :default)
+    def load_contract(contract_path, host, format = :legacy)
       load_contracts(contract_path, host, format).first
     end
 
-    def load_contracts(contracts_path, host, format = :default)
+    def load_contracts(contracts_path, host, format = :legacy)
       contracts = ContractFactory.load_contracts(contracts_path, host, format)
       contracts.each do |contract|
         contract_registry.register(contract)

data/lib/pacto/actors/json_generator.rb

@@ -5,7 +5,7 @@ module Pacto
       def build_request(contract, values = {})
         data = contract.request.to_hash
         data['uri'] = contract.request.uri(values)
-        data['body'] = JSON::Generator.generate(data['schema'])
+        data['body'] = JSON::Generator.generate(data['schema']) if data['schema']
         data['method'] = contract.request.http_method
         Pacto::PactoRequest.new(data)
       end

data/lib/pacto/body_parsing.rb

@@ -0,0 +1,42 @@
+# -*- encoding : utf-8 -*-
+
+module Pacto
+  module Handlers
+    autoload :JSONHandler, 'pacto/handlers/json_handler'
+    autoload :TextHandler, 'pacto/handlers/text_handler'
+    autoload :XMLHandler,  'pacto/handlers/xml_handler'
+  end
+  module BodyParsing
+    def raw_body
+      return nil if body.nil?
+      return body if body.respond_to? :to_str
+
+      body_handler.raw(body)
+    end
+
+    def parsed_body
+      return nil if body.nil?
+
+      body_handler.parse(body)
+    end
+
+    def content_type
+      headers['Content-Type']
+    end
+
+    def body_handler
+      case content_type
+      when /\bjson$/
+        Pacto::Handlers::JSONHandler
+      when /\btext$/
+        Pacto::Handlers::TextHandler
+      # No XML support - yet
+      # when /\bxml$/
+      #   XMLHandler
+      else
+        # JSON is still the default
+        Pacto::Handlers::JSONHandler
+      end
+    end
+  end
+end

data/lib/pacto/consumer/faraday_driver.rb

@@ -2,9 +2,12 @@
 module Pacto
   class Consumer
     class FaradayDriver
+      include Pacto::Logger
       # Sends a Pacto::PactoRequest
       def execute(req)
-        conn = Faraday.new(url: req.uri.site) do |faraday|
+        conn_options = { url: req.uri.site }
+        conn_options[:proxy] = Pacto.configuration.proxy if Pacto.configuration.proxy
+        conn = Faraday.new(conn_options) do |faraday|
           faraday.response :logger if Pacto.configuration.logger.level == :debug
           faraday.adapter Faraday.default_adapter
         end
@@ -12,7 +15,7 @@ module Pacto
         response = conn.send(req.method) do |faraday_request|
           faraday_request.url(req.uri.path, req.uri.query_values)
           faraday_request.headers = req.headers
-          faraday_request.body = req.body
+          faraday_request.body = req.raw_body
         end
 
         faraday_to_pacto_response response

data/lib/pacto/contract.rb

@@ -1,30 +1,29 @@
 # -*- encoding : utf-8 -*-
 module Pacto
-  class Contract < Pacto::Dash
-    property :id
-    property :file
-    property :request,  required: true
-    # Although I'd like response to be required, it complicates
-    # the partial contracts used the rake generation task...
-    # yet another reason I'd like to deprecate that feature
-    property :response # , required: true
-    property :values, default: {}
-    # Gotta figure out how to use test doubles w/ coercion
-    coerce_key :request,  RequestClause
-    coerce_key :response, ResponseClause
-    property :examples
-    property :name, required: true
-    property :adapter, default: proc { Pacto.configuration.adapter }
-    property :consumer, default: proc { Pacto.configuration.default_consumer }
-    property :provider, default: proc { Pacto.configuration.default_provider }
+  module Contract
+    include Logger
 
-    def initialize(opts)
-      if opts[:file]
-        opts[:file] = Addressable::URI.convert_path(File.expand_path(opts[:file])).to_s
-        opts[:name] ||= opts[:file]
-      end
-      opts[:id] ||= (opts[:summary] || opts[:file])
-      super
+    attr_reader :id
+    attr_reader :file
+    attr_reader :request
+    attr_reader :response
+    attr_reader :values
+    attr_reader :examples
+    attr_reader :name
+    attr_writer :adapter
+    attr_writer :consumer
+    attr_writer :provider
+
+    def adapter
+      @adapter ||= Pacto.configuration.adapter
+    end
+
+    def consumer
+      @consumer ||= Pacto.configuration.default_consumer
+    end
+
+    def provider
+      @provider ||= Pacto.configuration.default_provider
     end
 
     def examples?

data/lib/pacto/contract_factory.rb

@@ -16,14 +16,14 @@ module Pacto
       @factories.delete format
     end
 
-    def build(contract_files, host, format = :default)
+    def build(contract_files, host, format = :legacy)
       factory = @factories[format.to_sym]
       fail "No Contract factory registered for #{format}" if factory.nil?
 
       contract_files.map { |file| factory.build_from_file(file, host) }.flatten
     end
 
-    def load_contracts(contracts_path, host, format = :default)
+    def load_contracts(contracts_path, host, format = :legacy)
       factory = @factories[format.to_sym]
       files = factory.files_for(contracts_path)
       contracts = ContractFactory.build(files, host, format)
@@ -37,5 +37,5 @@ module Pacto
   end
 end
 
-require 'pacto/native_contract_factory'
-require 'pacto/swagger_contract_factory'
+require 'pacto/formats/legacy/contract_factory'
+require 'pacto/formats/swagger/contract_factory'

data/lib/pacto/core/configuration.rb

@@ -4,25 +4,31 @@ module Pacto
     attr_accessor :adapter, :strict_matchers,
                   :contracts_path, :logger, :generator_options,
                   :hide_deprecations, :default_consumer, :default_provider,
-                  :stenographer_log_file, :color
+                  :stenographer_log_file, :color, :proxy
     attr_reader :hook
 
-    def initialize
+    def initialize # rubocop:disable Metrics/MethodLength
       @middleware = Pacto::Core::HTTPMiddleware.new
       @middleware.add_observer Pacto::Cops, :investigate
       @generator = Pacto::Generator.contract_generator
       @middleware.add_observer @generator, :generate
-      @stenographer_log_file ||= File.expand_path('pacto_stenographer.log')
       @default_consumer = Pacto::Consumer.new
       @default_provider = Pacto::Provider.new
       @adapter = Stubs::WebMockAdapter.new(@middleware)
       @strict_matchers = true
       @contracts_path = '.'
-      @logger = Logger::SimpleLogger.instance
-      define_logger_level
       @hook = Hook.new {}
       @generator_options = { schema_version: 'draft3' }
       @color = $stdout.tty?
+      @proxy = ENV['PACTO_PROXY']
+    end
+
+    def logger
+      @logger ||= new_simple_logger
+    end
+
+    def stenographer_log_file
+      @stenographer_log_file ||= File.expand_path('pacto_stenographer.log')
     end
 
     def register_hook(hook = nil, &block)
@@ -36,11 +42,13 @@ module Pacto
 
     private
 
-    def define_logger_level
-      if ENV['PACTO_DEBUG']
-        @logger.level = :debug
-      else
-        @logger.level = :default
+    def new_simple_logger
+      Logger::SimpleLogger.instance.tap do | logger |
+        if ENV['PACTO_DEBUG']
+          logger.level = :debug
+        else
+          logger.level = :default
+        end
       end
     end
   end