pacto 0.4.0.rc1 → 0.4.0.rc2

data/spec/unit/pacto/stubs/webmock_adapter_spec.rb

@@ -142,10 +142,8 @@ module Pacto
               )
             end
 
-            it 'uses WebMock to stub the request' do
-              expect(request_pattern).to receive(:with).
-                with({}).
-                and_return(stubbed_request)
+            it 'does not send parameter details to WebMock' do
+              expect(request_pattern).to_not receive(:with)
               adapter.stub_request! contract
             end
           end

data/tasks/release.rake

@@ -35,7 +35,7 @@ task :release_gem do
 end
 
 desc 'Releases to RubyGems and GitHub'
-task :release => [:build, :release_gem, :documentation, :package, :create_release, :upload_docs]
+task :release => [:build, :release_gem, :samples, :package, :create_release, :upload_docs]
 
 desc 'Preview the changelog'
 task :changelog do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pacto
 version: !ruby/object:Gem::Version
-  version: 0.4.0.rc1
+  version: 0.4.0.rc2
 platform: ruby
 authors:
 - ThoughtWorks & Abril
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
@@ -17,9 +17,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.18'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.20.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.18'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.20.3
 - !ruby/object:Gem::Dependency
   name: swagger-core
   requirement: !ruby/object:Gem::Requirement
@@ -433,6 +427,7 @@ files:
 - README.md
 - Rakefile
 - TODO.md
+- appveyor.yml
 - bin/pacto
 - changelog.md
 - docs/configuration.md
@@ -462,12 +457,12 @@ files:
 - lib/pacto/actor.rb
 - lib/pacto/actors/from_examples.rb
 - lib/pacto/actors/json_generator.rb
+- lib/pacto/body_parsing.rb
 - lib/pacto/cli.rb
 - lib/pacto/cli/helpers.rb
 - lib/pacto/consumer.rb
 - lib/pacto/consumer/faraday_driver.rb
 - lib/pacto/contract.rb
-- lib/pacto/contract_builder.rb
 - lib/pacto/contract_factory.rb
 - lib/pacto/contract_files.rb
 - lib/pacto/contract_set.rb
@@ -487,19 +482,29 @@ files:
 - lib/pacto/core/pacto_response.rb
 - lib/pacto/dash.rb
 - lib/pacto/erb_processor.rb
-- lib/pacto/exceptions/invalid_contract.rb
+- lib/pacto/errors.rb
 - lib/pacto/extensions.rb
 - lib/pacto/forensics/investigation_filter.rb
 - lib/pacto/forensics/investigation_matcher.rb
+- lib/pacto/formats/legacy/contract.rb
+- lib/pacto/formats/legacy/contract_builder.rb
+- lib/pacto/formats/legacy/contract_factory.rb
+- lib/pacto/formats/legacy/contract_generator.rb
+- lib/pacto/formats/legacy/generator/filters.rb
+- lib/pacto/formats/legacy/generator_hint.rb
+- lib/pacto/formats/legacy/request_clause.rb
+- lib/pacto/formats/legacy/response_clause.rb
+- lib/pacto/formats/swagger/contract.rb
+- lib/pacto/formats/swagger/contract_factory.rb
+- lib/pacto/formats/swagger/request_clause.rb
+- lib/pacto/formats/swagger/response_clause.rb
 - lib/pacto/generator.rb
-- lib/pacto/generator/filters.rb
-- lib/pacto/generator/hint.rb
-- lib/pacto/generator/native_contract_generator.rb
+- lib/pacto/handlers/json_handler.rb
+- lib/pacto/handlers/text_handler.rb
 - lib/pacto/hooks/erb_hook.rb
 - lib/pacto/investigation.rb
 - lib/pacto/logger.rb
 - lib/pacto/meta_schema.rb
-- lib/pacto/native_contract_factory.rb
 - lib/pacto/observers/stenographer.rb
 - lib/pacto/provider.rb
 - lib/pacto/rake_task.rb
@@ -511,7 +516,6 @@ files:
 - lib/pacto/server.rb
 - lib/pacto/stubs/uri_pattern.rb
 - lib/pacto/stubs/webmock_adapter.rb
-- lib/pacto/swagger_contract_factory.rb
 - lib/pacto/test_helper.rb
 - lib/pacto/ui.rb
 - lib/pacto/uri.rb
@@ -528,6 +532,7 @@ files:
 - sample_apis/hello_api.rb
 - sample_apis/ping_api.rb
 - sample_apis/reverse_api.rb
+- sample_apis/user_api.rb
 - samples/README.md
 - samples/Rakefile
 - samples/configuration.rb
@@ -537,6 +542,7 @@ files:
 - samples/contracts/get_album_cover.json
 - samples/contracts/localhost/api/echo.json
 - samples/contracts/localhost/api/ping.json
+- samples/contracts/user.json
 - samples/cops.rb
 - samples/forensics.rb
 - samples/generation.rb
@@ -552,28 +558,23 @@ files:
 - spec/fabricators/contract_fabricator.rb
 - spec/fabricators/http_fabricator.rb
 - spec/fabricators/webmock_fabricator.rb
-- spec/fixtures/contracts/contract.json
-- spec/fixtures/contracts/contract_with_examples.json
-- spec/fixtures/contracts/simple_contract.json
-- spec/fixtures/contracts/strict_contract.json
-- spec/fixtures/contracts/templating_contract.json
-- spec/fixtures/deprecated_contracts/deprecated_contract.json
-- spec/fixtures/swagger/petstore.yaml
+- spec/fixtures/contracts/deprecated/deprecated_contract.json
+- spec/fixtures/contracts/legacy/contract.json
+- spec/fixtures/contracts/legacy/contract_with_examples.json
+- spec/fixtures/contracts/legacy/simple_contract.json
+- spec/fixtures/contracts/legacy/strict_contract.json
+- spec/fixtures/contracts/legacy/templating_contract.json
+- spec/fixtures/contracts/swagger/petstore.yaml
 - spec/integration/e2e_spec.rb
 - spec/integration/forensics/integration_matcher_spec.rb
 - spec/integration/rspec_spec.rb
 - spec/integration/templating_spec.rb
-- spec/pacto/dummy_server.rb
-- spec/pacto/dummy_server/dummy.rb
-- spec/pacto/dummy_server/jruby_workaround_helper.rb
-- spec/pacto/dummy_server/playback_servlet.rb
 - spec/spec_helper.rb
 - spec/unit/actors/from_examples_spec.rb
 - spec/unit/actors/json_generator_spec.rb
 - spec/unit/pacto/actor_spec.rb
 - spec/unit/pacto/configuration_spec.rb
 - spec/unit/pacto/consumer/faraday_driver_spec.rb
-- spec/unit/pacto/contract_builder_spec.rb
 - spec/unit/pacto/contract_factory_spec.rb
 - spec/unit/pacto/contract_files_spec.rb
 - spec/unit/pacto/contract_set_spec.rb
@@ -589,22 +590,24 @@ files:
 - spec/unit/pacto/core/modes_spec.rb
 - spec/unit/pacto/erb_processor_spec.rb
 - spec/unit/pacto/extensions_spec.rb
-- spec/unit/pacto/generator/filters_spec.rb
-- spec/unit/pacto/generator/native_contract_generator_spec.rb
+- spec/unit/pacto/formats/legacy/contract_builder_spec.rb
+- spec/unit/pacto/formats/legacy/contract_factory_spec.rb
+- spec/unit/pacto/formats/legacy/contract_generator_spec.rb
+- spec/unit/pacto/formats/legacy/contract_spec.rb
+- spec/unit/pacto/formats/legacy/generator/filters_spec.rb
+- spec/unit/pacto/formats/legacy/request_clause_spec.rb
+- spec/unit/pacto/formats/legacy/response_clause_spec.rb
+- spec/unit/pacto/formats/swagger/contract_factory_spec.rb
+- spec/unit/pacto/formats/swagger/contract_spec.rb
 - spec/unit/pacto/hooks/erb_hook_spec.rb
 - spec/unit/pacto/investigation_registry_spec.rb
 - spec/unit/pacto/logger_spec.rb
 - spec/unit/pacto/meta_schema_spec.rb
-- spec/unit/pacto/native_contract_factory_spec.rb
 - spec/unit/pacto/pacto_spec.rb
-- spec/unit/pacto/request_clause_spec.rb
 - spec/unit/pacto/request_pattern_spec.rb
-- spec/unit/pacto/response_clause_spec.rb
-- spec/unit/pacto/server/playback_servlet_spec.rb
 - spec/unit/pacto/stubs/observers/stenographer_spec.rb
 - spec/unit/pacto/stubs/uri_pattern_spec.rb
 - spec/unit/pacto/stubs/webmock_adapter_spec.rb
-- spec/unit/pacto/swagger_contract_factory_spec.rb
 - spec/unit/pacto/uri_spec.rb
 - tasks/release.rake
 homepage: http://thoughtworks.github.io/pacto/
@@ -648,28 +651,23 @@ test_files:
 - spec/fabricators/contract_fabricator.rb
 - spec/fabricators/http_fabricator.rb
 - spec/fabricators/webmock_fabricator.rb
-- spec/fixtures/contracts/contract.json
-- spec/fixtures/contracts/contract_with_examples.json
-- spec/fixtures/contracts/simple_contract.json
-- spec/fixtures/contracts/strict_contract.json
-- spec/fixtures/contracts/templating_contract.json
-- spec/fixtures/deprecated_contracts/deprecated_contract.json
-- spec/fixtures/swagger/petstore.yaml
+- spec/fixtures/contracts/deprecated/deprecated_contract.json
+- spec/fixtures/contracts/legacy/contract.json
+- spec/fixtures/contracts/legacy/contract_with_examples.json
+- spec/fixtures/contracts/legacy/simple_contract.json
+- spec/fixtures/contracts/legacy/strict_contract.json
+- spec/fixtures/contracts/legacy/templating_contract.json
+- spec/fixtures/contracts/swagger/petstore.yaml
 - spec/integration/e2e_spec.rb
 - spec/integration/forensics/integration_matcher_spec.rb
 - spec/integration/rspec_spec.rb
 - spec/integration/templating_spec.rb
-- spec/pacto/dummy_server.rb
-- spec/pacto/dummy_server/dummy.rb
-- spec/pacto/dummy_server/jruby_workaround_helper.rb
-- spec/pacto/dummy_server/playback_servlet.rb
 - spec/spec_helper.rb
 - spec/unit/actors/from_examples_spec.rb
 - spec/unit/actors/json_generator_spec.rb
 - spec/unit/pacto/actor_spec.rb
 - spec/unit/pacto/configuration_spec.rb
 - spec/unit/pacto/consumer/faraday_driver_spec.rb
-- spec/unit/pacto/contract_builder_spec.rb
 - spec/unit/pacto/contract_factory_spec.rb
 - spec/unit/pacto/contract_files_spec.rb
 - spec/unit/pacto/contract_set_spec.rb
@@ -685,20 +683,22 @@ test_files:
 - spec/unit/pacto/core/modes_spec.rb
 - spec/unit/pacto/erb_processor_spec.rb
 - spec/unit/pacto/extensions_spec.rb
-- spec/unit/pacto/generator/filters_spec.rb
-- spec/unit/pacto/generator/native_contract_generator_spec.rb
+- spec/unit/pacto/formats/legacy/contract_builder_spec.rb
+- spec/unit/pacto/formats/legacy/contract_factory_spec.rb
+- spec/unit/pacto/formats/legacy/contract_generator_spec.rb
+- spec/unit/pacto/formats/legacy/contract_spec.rb
+- spec/unit/pacto/formats/legacy/generator/filters_spec.rb
+- spec/unit/pacto/formats/legacy/request_clause_spec.rb
+- spec/unit/pacto/formats/legacy/response_clause_spec.rb
+- spec/unit/pacto/formats/swagger/contract_factory_spec.rb
+- spec/unit/pacto/formats/swagger/contract_spec.rb
 - spec/unit/pacto/hooks/erb_hook_spec.rb
 - spec/unit/pacto/investigation_registry_spec.rb
 - spec/unit/pacto/logger_spec.rb
 - spec/unit/pacto/meta_schema_spec.rb
-- spec/unit/pacto/native_contract_factory_spec.rb
 - spec/unit/pacto/pacto_spec.rb
-- spec/unit/pacto/request_clause_spec.rb
 - spec/unit/pacto/request_pattern_spec.rb
-- spec/unit/pacto/response_clause_spec.rb
-- spec/unit/pacto/server/playback_servlet_spec.rb
 - spec/unit/pacto/stubs/observers/stenographer_spec.rb
 - spec/unit/pacto/stubs/uri_pattern_spec.rb
 - spec/unit/pacto/stubs/webmock_adapter_spec.rb
-- spec/unit/pacto/swagger_contract_factory_spec.rb
 - spec/unit/pacto/uri_spec.rb

data/lib/pacto/contract_builder.rb

@@ -1,125 +0,0 @@
-# -*- encoding : utf-8 -*-
-module Pacto
-  class ContractBuilder < Hashie::Dash # rubocop:disable Metrics/ClassLength
-    extend Forwardable
-    attr_accessor :source
-
-    def initialize(options = {})
-      @schema_generator = options[:schema_generator] ||= JSON::SchemaGenerator
-      @filters = options[:filters] ||= Pacto::Generator::Filters.new
-      @data = { request: {}, response: {}, examples: {} }
-      @source = 'Pacto' # Currently used by JSONSchemaGeneator, but not really useful
-    end
-
-    def name=(name)
-      @data[:name] = name
-    end
-
-    def add_example(name, pacto_request, pacto_response)
-      @data[:examples][name] ||= {}
-      @data[:examples][name][:request] = clean(pacto_request.to_hash)
-      @data[:examples][name][:response] = clean(pacto_response.to_hash)
-      self
-    end
-
-    def infer_all
-      # infer_file # The target file is being chosen inferred by the Generator
-      infer_name
-      infer_schemas
-    end
-
-    def infer_name
-      if @data[:examples].empty?
-        @data[:name] = @data[:request][:path] if @data[:request]
-        return self
-      end
-
-      example, hint = example_and_hint
-      @data[:name] = hint.nil? ? PactoRequest.new(example[:request]).uri.path : hint.service_name
-      self
-    end
-
-    def infer_schemas
-      return self if @data[:examples].empty?
-
-      # TODO: It'd be awesome if we could infer across all examples
-      example, _hint = example_and_hint
-      sample_request_body = example[:request][:body]
-      sample_response_body = example[:response][:body]
-      @data[:request][:schema] = generate_schema(sample_request_body) if sample_request_body && !sample_request_body.empty?
-      @data[:response][:schema] = generate_schema(sample_response_body) if sample_response_body && !sample_response_body.empty?
-      self
-    end
-
-    def without_examples
-      @export_examples = false
-      self
-    end
-
-    def generate_contract(request, response)
-      generate_request(request, response)
-      generate_response(request, response)
-      infer_all
-      self
-    end
-
-    def generate_request(request, response)
-      hint = hint_for(request)
-      request = clean(
-                        headers: @filters.filter_request_headers(request, response),
-                        http_method: request.method,
-                        params: request.uri.query_values,
-                        path: hint.nil? ? request.uri.path : hint.path
-                      )
-      @data[:request] = request
-      self
-    end
-
-    def generate_response(request, response)
-      response = clean(
-                         headers: @filters.filter_response_headers(request, response),
-                         status: response.status
-                       )
-      @data[:response] = response
-      self
-    end
-
-    def build_hash
-      instance_eval(&block) if block_given?
-      @final_data = @data.dup
-      @final_data.delete(:examples) if exclude_examples?
-      clean(@final_data)
-    end
-
-    def build(&block)
-      Contract.new build_hash(&block)
-    end
-
-    protected
-
-    def example_and_hint
-      example = @data[:examples].values.first
-      example_request = PactoRequest.new example[:request]
-      [example, Pacto::Generator.hint_for(example_request)]
-    end
-
-    def exclude_examples?
-      @export_examples == false
-    end
-
-    def generate_schema(body, generator_options = Pacto.configuration.generator_options)
-      return if body.nil? || body.empty?
-
-      body_schema = @schema_generator.generate @source, body, generator_options
-      MultiJson.load(body_schema)
-    end
-
-    def clean(data)
-      data.delete_if { |_k, v| v.nil? }
-    end
-
-    def hint_for(pacto_request)
-      Pacto::Generator.hint_for(pacto_request)
-    end
-  end
-end

data/lib/pacto/exceptions/invalid_contract.rb

@@ -1,12 +0,0 @@
-# -*- encoding : utf-8 -*-
-class InvalidContract < ArgumentError
-  attr_reader :errors
-
-  def initialize(errors)
-    @errors = errors
-  end
-
-  def message
-    @errors.join "\n"
-  end
-end

data/lib/pacto/generator/filters.rb

@@ -1,42 +0,0 @@
-# -*- encoding : utf-8 -*-
-module Pacto
-  module Generator
-    class Filters
-      CONNECTION_CONTROL_HEADERS = %w(
-        Via
-        Server
-        Connection
-        Transfer-Encoding
-        Content-Length
-      )
-
-      FRESHNESS_HEADERS =
-      %w(
-        Date
-        Last-Modified
-        ETag
-      )
-
-      HEADERS_TO_FILTER = CONNECTION_CONTROL_HEADERS + FRESHNESS_HEADERS
-
-      def filter_request_headers(request, response)
-        # FIXME: Do we need to handle all these cases in real situations, or just because of stubbing?
-        vary_headers = response.headers['vary'] || response.headers['Vary'] || []
-        vary_headers = [vary_headers] if vary_headers.is_a? String
-        vary_headers = vary_headers.map do |h|
-          h.split(',').map(&:strip)
-        end.flatten
-
-        request.headers.select do |header|
-          vary_headers.map(&:downcase).include? header.downcase
-        end
-      end
-
-      def filter_response_headers(_request, response)
-        Pacto::Extensions.normalize_header_keys(response.headers).reject do |header|
-          (HEADERS_TO_FILTER.include? header) || (header.start_with?('X-'))
-        end
-      end
-    end
-  end
-end