pacto 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3465015cc69868938ee729098b3c08df3a0df32a
-  data.tar.gz: 65e2129430e2679ae8b2bc6dc109447a35e3a174
+  metadata.gz: 18ae0d545ae833247f073b842eb80cae0bfe15bd
+  data.tar.gz: 7bbc42514d8b1efecaa5dd650d042f4135ead5da
 SHA512:
-  metadata.gz: b14f918661f414d1f2e84b7dc6a95903e18f0ead81eb4f7188eedb9761e3e2aeda225b2c8f0bd97d322593a41b6d71f1d1b99c150f4e155d7995e078137f0bf6
-  data.tar.gz: f030e06b0d84bee8ed495a0f0c9d4434255dec6c7904d5249c62ea5e0a1bffd737e61aaba6b7b3b7e5ca00d8f2e0e507e474ed9f55598af2ab1ee075db4ac7da
+  metadata.gz: b3518a69c9f3d65f241f23ed2879349b6016f9411c2991e2bbed85a63ad0091959aedb5d829f7111f14c47a4596a158bf5b3294e8e8c8a951c45f63629cd374a
+  data.tar.gz: 22d00ac297683e0233c7d002891f5a5f26e133dbc8f7590a3431b567b48200ddd5c0fc02750f9eb17dcd077480a8fe15a9846c8d885f84c51595c1c3cc290fbb

data/.gitignore

@@ -20,6 +20,5 @@ tmp
 .idea/
 .floo*
 .sublime*
-bin/*
 tags
-
+pacto.log

data/CHANGELOG

@@ -0,0 +1,12 @@
+0.3.1
+
+  Enhancements:
+    * #103 - Display file URI instead of meaningless schema identifier in messages
+
+  Bug Fixes:
+    * #102 - Fix rake pacto:generate task
+
+
+0.3.0
+
+  First stable release

data/CONTRIBUTING.md

@@ -77,6 +77,12 @@ tasks:
 - Integration tests (`bundle exec rake integration`).
 - User journey tests (`bundle exec rake journey`).
 
+It is also possible run specific tests:
+
+- Unit tests (`bundle exec rspec spec/unit/[file_path]`
+- Integration tests  (`bundle exec rspec spec/integration/[file_path]`)
+- User journey tests (`bundle exec cucumber features/[file_path] -r features/support/env.rb`)
+
 ### Checking that all is green
 
 To know that both tests and static analysis is working fine you just have to

data/Gemfile

@@ -1,7 +1,12 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in pacto.gemspec
-gemspec
+gemspec :name => 'pacto'
+
+Dir['pacto-*.gemspec'].each do |gemspec|
+  plugin = gemspec.scan(/pacto-(.*)\.gemspec/).flatten.first
+  gemspec(:name => "pacto-#{plugin}", :development_group => plugin)
+end
 
 # 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/README.md

@@ -7,7 +7,7 @@
 **If you're viewing this at https://github.com/thoughtworks/pacto,
 you're reading the documentation for the master branch.
 [View documentation for the latest release
-(0.2.5).](https://github.com/thoughtworks/pacto/tree/v0.2.5)**
+(0.3.0).](https://github.com/thoughtworks/pacto/tree/v0.3.0)**
 
 # Pacto
 
@@ -44,6 +44,8 @@ Pacto can provide a [**contract writer**](#generating) that tries to strike a ba
 
 ## Usage
 
+**See also: http://thoughtworks.github.io/pacto/usage/**
+
 Pacto can perform three activities: generating, validating, or stubbing services.  You can do each of these activities against either live or stubbed services.
 
 ### Configuration
@@ -122,6 +124,8 @@ contracts.stub_all(request_id: 14, name: "Marcos")
 
 ## Pacto Server (non-Ruby usage)
 
+**See also: http://thoughtworks.github.io/pacto/patterns/polyglot/**
+
 It is really easy to embed Pacto inside a small server.  We haven't bundled a server inside of Pacto, but check out [pacto-demo](https://github.com/thoughtworks/pacto-demo) to see how easily you can expose Pacto via server.
 
 That demo lets you easily run a server in several modes:

data/Rakefile

@@ -1,4 +1,3 @@
-require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'pacto/rake_task'
 require 'cucumber'
@@ -27,3 +26,39 @@ RSpec::Core::RakeTask.new(:integration) do |t|
 end
 
 task :default => [:unit, :integration, :journeys, :rubocop, 'coveralls:push']
+
+desc 'Build gems into the pkg directory'
+task :build do
+  FileUtils.rm_rf('pkg')
+  Dir['*.gemspec'].each do |gemspec|
+    system "gem build #{gemspec}"
+  end
+  FileUtils.mkdir_p('pkg')
+  FileUtils.mv(Dir['*.gem'], 'pkg')
+end
+
+desc 'Tags version, pushes to remote, and pushes gems'
+task :release => :build do
+  sh 'git', 'tag', '-m', changelog, "v#{Pacto::VERSION}"
+  sh 'git push origin master'
+  sh "git push origin v#{Pacto::VERSION}"
+  sh 'ls pkg/*.gem | xargs -n 1 gem push'
+end
+
+task :changelog do
+  changelog
+end
+
+def changelog
+  changelog = File.read('CHANGELOG').split("\n\n\n", 2).first
+  confirm "Does the CHANGELOG look correct? ", changelog
+end
+
+def confirm(question, data)
+  puts "Please confirm..."
+  puts data
+  print question
+  abort "Aborted" unless $stdin.gets.strip == 'y'
+  puts "Confirmed"
+  data
+end

data/features/generate/generation.feature

@@ -26,3 +26,54 @@ 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']`
+    Then the output should contain "Successfully generated all contracts"
+
+  Scenario: Generating a contract programmatically
+    Given a file named "generate.rb" with:
+    """ruby
+    require 'pacto'
+
+    WebMock.allow_net_connect!
+    generator = Pacto::Generator.new
+    contract = generator.generate('requests/my_contract.json', 'http://localhost:8000')
+    puts contract
+    """
+    When I successfully run `bundle exec ruby generate.rb`
+    Then the output should contain exactly:
+    """json
+    {
+      "request": {
+        "headers": {
+          "Accept": "application/json"
+        },
+        "method": "get",
+        "params": {
+        },
+        "path": "/hello"
+      },
+      "response": {
+        "headers": {
+          "Content-Type": "application/json",
+          "Vary": "Accept"
+        },
+        "status": 200,
+        "body": {
+          "$schema": "http://json-schema.org/draft-03/schema#",
+          "description": "Generated from requests/my_contract.json with shasum 210fa3b144ef2db8d1c160c4d9e8d8bf738ed851",
+          "type": "object",
+          "required": true,
+          "properties": {
+            "message": {
+              "type": "string",
+              "required": true
+            }
+          }
+        }
+      }
+    }
+
+    """

data/lib/pacto/contract.rb

@@ -5,7 +5,7 @@ module Pacto
     def initialize(request, response, file, name = nil, request_pattern_provider = RequestPattern)
       @request = request
       @response = response
-      @file = file.to_s
+      @file = Addressable::URI.convert_path(file.to_s).to_s
       @name = name || @file
       @request_pattern = request_pattern_provider.for(request)
       @values = {}

data/lib/pacto/core/configuration.rb

@@ -8,7 +8,7 @@ module Pacto
       @provider = Stubs::WebMockAdapter.new
       @strict_matchers = true
       @contracts_path = nil
-      @logger = Logger.instance
+      @logger = Logger::SimpleLogger.instance
       define_logger_level
       @hook = Hook.new {}
       @generator_options = { :schema_version => 'draft3' }

data/lib/pacto/core/validation_registry.rb

@@ -1,6 +1,7 @@
 module Pacto
   class ValidationRegistry
     include Singleton
+    include Logger
     attr_reader :validations
 
     def initialize
@@ -35,11 +36,5 @@ module Pacto
         !validation.successful?
       end
     end
-
-    private
-
-    def logger
-      @logger ||= Logger.instance
-    end
   end
 end

data/lib/pacto/erb_processor.rb

@@ -1,9 +1,10 @@
 module Pacto
   class ERBProcessor
+    include Logger
     def process(contract, values = {})
       erb = ERB.new(contract)
       erb_result = erb.result hash_binding(values)
-      Logger.instance.debug "Processed contract: #{erb_result.inspect}"
+      logger.debug "Processed contract: #{erb_result.inspect}"
       erb_result
     end
 

data/lib/pacto/generator.rb

@@ -14,6 +14,13 @@ module Pacto
       @filters = filters
     end
 
+    def generate(request_file, host)
+      contract = Pacto.load_contract request_file, host
+      request = contract.request
+      response = contract.request.execute
+      save(request_file, request, response)
+    end
+
     def save(source, request, response)
       contract = generate_contract source, request, response
       pretty_contract = MultiJson.encode(contract, :pretty => true)

data/lib/pacto/logger.rb

@@ -1,44 +1,50 @@
 require 'forwardable'
 
 module Pacto
-  class Logger
-    include Singleton
-    extend Forwardable
-
-    def_delegators :@log, :debug, :info, :warn, :error, :fatal
-
-    def initialize
-      log ::Logger.new STDOUT
-    end
-
-    def log(log)
-      @log = log
-      @log.level = default_level
-      @log.progname = 'Pacto'
-    end
-
-    def level=(level)
-      @log.level = log_levels.fetch(level, default_level)
-    end
-
-    def level
-      log_levels.key @log.level
-    end
-
-    private
-
-    def default_level
-      ::Logger::ERROR
+  module Logger
+    def logger
+      Pacto.configuration.logger
     end
 
-    def log_levels
-      {
-        debug: ::Logger::DEBUG,
-        info:  ::Logger::INFO,
-        warn:  ::Logger::WARN,
-        error: ::Logger::ERROR,
-        fatal: ::Logger::FATAL
-      }
+    class SimpleLogger
+      include Singleton
+      extend Forwardable
+
+      def_delegators :@log, :debug, :info, :warn, :error, :fatal
+
+      def initialize
+        log ::Logger.new STDOUT
+      end
+
+      def log(log)
+        @log = log
+        @log.level = default_level
+        @log.progname = 'Pacto'
+      end
+
+      def level=(level)
+        @log.level = log_levels.fetch(level, default_level)
+      end
+
+      def level
+        log_levels.key @log.level
+      end
+
+      private
+
+      def default_level
+        ::Logger::ERROR
+      end
+
+      def log_levels
+        {
+          debug: ::Logger::DEBUG,
+          info:  ::Logger::INFO,
+          warn:  ::Logger::WARN,
+          error: ::Logger::ERROR,
+          fatal: ::Logger::FATAL
+        }
+      end
     end
   end
 end

data/lib/pacto/stubs/webmock_helper.rb

@@ -2,6 +2,8 @@ module Pacto
   module Stubs
     class WebMockHelper
       class << self
+        include Logger
+
         def validate(request_signature, response)
           pacto_response = webmock_to_pacto_response(response)
           contract = Pacto.contracts_for(request_signature).first
@@ -43,10 +45,6 @@ module Pacto
           File.join(Pacto.configuration.contracts_path, uri.host, File.dirname(uri.path), basename)
         end
 
-        def logger
-          @logger ||= Logger.instance
-        end
-
         def webmock_to_pacto_request(webmock_request)
           uri = webmock_request.uri
           Faraday::Request.create webmock_request.method do |req|

data/lib/pacto/validation.rb

@@ -1,5 +1,6 @@
 module Pacto
   class Validation
+    include Logger
     attr_reader :request, :response, :contract, :results
 
     def initialize(request, response, contract)
@@ -45,10 +46,6 @@ module Pacto
 
     private
 
-    def logger
-      @logger ||= Logger.instance
-    end
-
     def validate
       logger.debug("Validating #{@request}, #{@response} against #{@contract}")
       @results = contract.validate_consumer(@request, @response)

data/lib/pacto/validators/body_validator.rb

@@ -5,17 +5,24 @@ module Pacto
         fail 'section name should be provided by subclass'
       end
 
-      def self.validate(schema, body)
+      def self.subschema(contract)
+        fail 'override to return the proper subschema the contract'
+      end
+
+      # FIXME: https://github.com/thoughtworks/pacto/issues/10#issuecomment-31281238
+      # rubocop:disable MethodLenth
+      def self.validate(contract, body)
+        schema = subschema(contract)
         if schema
+          schema['id'] = contract.file unless schema.key? 'id'
           if schema['type'] && schema['type'] == 'string'
             validate_as_pure_string schema, body.body
           else
-            body.respond_to?(:body) ? validate_as_json(schema, body.body) : validate_as_json(schema, body)
+            validate_as_json(schema, body)
           end
-        else
-          []
-        end
+        end || []
       end
+      # rubocop:enable MethodLenth
 
       private
 
@@ -34,6 +41,7 @@ module Pacto
       end
 
       def self.validate_as_json(schema, body)
+        body = body.body if body.respond_to? :body
         JSON::Validator.fully_validate(schema, body, :version => :draft3)
       end
     end

data/lib/pacto/validators/request_body_validator.rb

@@ -9,11 +9,14 @@ module Pacto
         'request'
       end
 
+      def self.subschema(contract)
+        contract.request.schema
+      end
+
       def call(env)
         if env[:validation_results].empty? # skip body validation if we already have other errors
-          expected_body = env[:contract].request.schema
           actual_body = env[:actual_request]
-          errors = self.class.validate(expected_body, actual_body)
+          errors = self.class.validate(env[:contract], actual_body)
           env[:validation_results].concat errors.compact
         end
         @app.call env

data/lib/pacto/validators/response_body_validator.rb

@@ -9,11 +9,14 @@ module Pacto
         'response'
       end
 
+      def self.subschema(contract)
+        contract.response.schema
+      end
+
       def call(env)
         if env[:validation_results].empty? # skip body validation if we already have other errors
-          expected_body = env[:contract].response.schema
           actual_body = env[:actual_response]
-          errors = self.class.validate(expected_body, actual_body)
+          errors = self.class.validate(env[:contract], actual_body)
           env[:validation_results].concat errors.compact
         end
         @app.call env

data/lib/pacto/version.rb

@@ -1,3 +1,3 @@
 module Pacto
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/pacto.gemspec

@@ -3,6 +3,10 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'pacto/version'
 
+plugin_files = Dir['pacto-*.gemspec'].map do |gemspec|
+  eval(File.read(gemspec)).files # rubocop:disable Eval
+end.flatten.uniq
+
 Gem::Specification.new do |gem|
   gem.name          = 'pacto'
   gem.version       = Pacto::VERSION
@@ -13,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'http://thoughtworks.github.io/pacto/'
   gem.license       = 'MIT'
 
-  gem.files         = `git ls-files`.split($/) # rubocop:disable SpecialGlobalVars
+  gem.files         = `git ls-files`.split($/) - plugin_files # rubocop:disable SpecialGlobalVars
   gem.executables   = gem.files.grep(/^bin\//).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(/^(test|spec|features)\//)
   gem.require_paths = ['lib']
@@ -22,24 +26,25 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'middleware', '~> 0.1'
   gem.add_dependency 'multi_json', '~> 1.8'
   gem.add_dependency 'json-schema', '~> 2.0'
-  gem.add_dependency 'json-generator', '>= 0.0.5'
+  gem.add_dependency 'json-generator', '~> 0.0', '>= 0.0.5'
   gem.add_dependency 'hash-deep-merge', '~> 0.1'
   gem.add_dependency 'faraday', '~> 0.9'
   gem.add_dependency 'addressable', '~> 2.3'
-  gem.add_dependency 'json-schema-generator', '>= 0.0.7'
+  gem.add_dependency 'json-schema-generator', '~> 0.0', '>= 0.0.7'
   gem.add_dependency 'term-ansicolor', '~> 1.3'
 
-  gem.add_development_dependency 'coveralls'
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rake-notes'
+  gem.add_development_dependency 'coveralls', '~> 0'
+  gem.add_development_dependency 'rake', '~> 10.0'
+  gem.add_development_dependency 'rake-notes', '~> 0'
   gem.add_development_dependency 'rspec', '~> 2.14'
-  gem.add_development_dependency 'should_not'
-  gem.add_development_dependency 'aruba'
-  gem.add_development_dependency 'relish'
-  gem.add_development_dependency 'guard-rspec'
-  gem.add_development_dependency 'rubocop', '~> 0.16.0'
-  gem.add_development_dependency 'guard-rubocop'
-  gem.add_development_dependency 'guard-cucumber'
-  gem.add_development_dependency 'rb-fsevent' if RUBY_PLATFORM =~ /darwin/i
-  gem.add_development_dependency 'terminal-notifier-guard' if RUBY_PLATFORM =~ /darwin/i
+  gem.add_development_dependency 'should_not', '~> 1.0'
+  gem.add_development_dependency 'aruba', '~> 0'
+  # Only required to push documentation, and not easily installed on Windows
+  # gem.add_development_dependency 'relish'
+  gem.add_development_dependency 'guard-rspec', '~> 4.2'
+  gem.add_development_dependency 'rubocop', '~> 0.16'
+  gem.add_development_dependency 'guard-rubocop', '~> 1.0'
+  gem.add_development_dependency 'guard-cucumber', '~> 1.4'
+  gem.add_development_dependency 'rb-fsevent', '~> 0' if RUBY_PLATFORM =~ /darwin/i
+  gem.add_development_dependency 'terminal-notifier-guard', '~> 1.5' if RUBY_PLATFORM =~ /darwin/i
 end

data/spec/integration/data/simple_contract.json

@@ -10,7 +10,7 @@
 
   "response": {
     "status": 200,
-    "headers": { "Content-Type": "application/json" },
+    "headers": { "Content-Type": "application/json", "Vary": "Accept" },
     "body": {
       "type": "object",
       "required": true,

data/spec/integration/rspec_spec.rb

@@ -25,6 +25,13 @@ describe 'pacto/rspec' do
     MultiJson.load(response.body)
   end
 
+  def play_bad_response
+    contracts.stub_all(:device_id => 1.5)
+    Faraday.get('http://dummyprovider.com/strict') do |req|
+      req.headers = {'Accept' => 'application/json' }
+    end
+  end
+
   context 'successful validations' do
     let(:contracts) do
       Pacto.load_contracts 'spec/integration/data/', 'http://dummyprovider.com'
@@ -82,13 +89,15 @@ describe 'pacto/rspec' do
     end
 
     it 'displays Contract validation problems' do
-      contracts.stub_all(:device_id => 1.5)
-      Faraday.get('http://dummyprovider.com/strict') do |req|
-        req.headers = {'Accept' => 'application/json' }
-      end
+      play_bad_response
       expect_to_raise(/validation errors were found:/) { expect(Pacto).to have_validated(:get, 'http://dummyprovider.com/strict') }
-
       expect_to_raise(/but the following issues were found:/) { expect(Pacto).to_not have_failed_validations }
     end
+
+    it 'displays the Contract file' do
+      play_bad_response
+      schema_file_uri = Addressable::URI.convert_path(File.absolute_path strict_contract_path).to_s
+      expect_to_raise(/in schema #{schema_file_uri}/) { expect(Pacto).to have_validated(:get, 'http://dummyprovider.com/strict') }
+    end
   end
 end

data/spec/pacto/server/dummy.rb

@@ -1,5 +1,6 @@
 require 'webrick'
 require 'forwardable'
+require 'tempfile'
 
 module Pacto
   module Server
@@ -21,10 +22,11 @@ module Pacto
 
     class Dummy
       def initialize(port, path, response)
+        log_file = File.exists?('/dev/null') ? '/dev/null' : Tempfile.new('log') # So tests run on Windows
         params = {
           :Port => port,
           :AccessLog => [],
-          :Logger => WEBrick::Log.new('/dev/null', 7)
+          :Logger => WEBrick::Log.new(log_file, 7)
         }
         @server = WEBrick::HTTPServer.new params
         @server.mount path, Servlet, response

data/spec/unit/pacto/configuration_spec.rb

@@ -16,7 +16,7 @@ module Pacto
     end
 
     it 'sets logger by default to Logger' do
-      expect(configuration.logger).to be_kind_of Logger
+      expect(configuration.logger).to be_kind_of Logger::SimpleLogger
     end
 
     context 'about logging' do

data/spec/unit/pacto/contract_validator_spec.rb

@@ -42,13 +42,13 @@ module Pacto
 
     describe '.validate' do
       before do
-        allow(Pacto::Validators::RequestBodyValidator).to receive(:validate).with(expected_request.schema, actual_request).and_return([])
-        allow(Pacto::Validators::ResponseBodyValidator).to receive(:validate).with(expected_response.schema, actual_response).and_return([])
+        allow(Pacto::Validators::RequestBodyValidator).to receive(:validate).with(contract, actual_request).and_return([])
+        allow(Pacto::Validators::ResponseBodyValidator).to receive(:validate).with(contract, actual_response).and_return([])
       end
 
       context 'default validator stack' do
         it 'calls the RequestBodyValidator' do
-          expect(Pacto::Validators::RequestBodyValidator).to receive(:validate).with(expected_request.schema, actual_request).and_return(validation_errors)
+          expect(Pacto::Validators::RequestBodyValidator).to receive(:validate).with(contract, actual_request).and_return(validation_errors)
           expect(ContractValidator.validate contract, actual_request, actual_response, opts).to eq(validation_errors)
         end
 
@@ -63,7 +63,7 @@ module Pacto
         end
 
         it 'calls the ResponseBodyValidator' do
-          expect(Pacto::Validators::ResponseBodyValidator).to receive(:validate).with(expected_response.schema, actual_response).and_return(validation_errors)
+          expect(Pacto::Validators::ResponseBodyValidator).to receive(:validate).with(contract, actual_response).and_return(validation_errors)
           expect(ContractValidator.validate contract, actual_request, actual_response, opts).to eq(validation_errors)
         end
       end
@@ -73,10 +73,10 @@ module Pacto
           # JSON::Validator.should_receive(:fully_validate).
           #   with(definition['body'], fake_response.body, :version => :draft3).
           #   and_return([])
-          expect(Pacto::Validators::RequestBodyValidator).to receive(:validate).with(expected_request.schema, actual_request).and_return([])
+          expect(Pacto::Validators::RequestBodyValidator).to receive(:validate).with(contract, actual_request).and_return([])
           expect(Pacto::Validators::ResponseStatusValidator).to receive(:validate).with(expected_response.status, actual_response.status).and_return([])
           expect(Pacto::Validators::ResponseHeaderValidator).to receive(:validate).with(expected_response.headers, actual_response.headers).and_return([])
-          expect(Pacto::Validators::ResponseBodyValidator).to receive(:validate).with(expected_response.schema, actual_response).and_return([])
+          expect(Pacto::Validators::ResponseBodyValidator).to receive(:validate).with(contract, actual_response).and_return([])
           expect(ContractValidator.validate contract, actual_request, actual_response, opts).to be_empty
         end
       end

data/spec/unit/pacto/erb_processor_spec.rb

@@ -11,7 +11,7 @@ module Pacto
       end
 
       it 'logs the erb processed' do
-        Logger.instance.should_receive(:debug).with("Processed contract: \"#{result}\"")
+        Pacto.configuration.logger.should_receive(:debug).with("Processed contract: \"#{result}\"")
         processor.process erb
       end
 

data/spec/unit/pacto/generator_spec.rb

@@ -3,19 +3,20 @@ module Pacto
     let(:record_host) do
       'http://example.com'
     end
-
     let(:request) do
-      Faraday::Request.create :get do |req|
-        req.path = '/abcd'
-        req.params = { 'apikey' => "<%= ENV['MY_API_KEY'] %>" }
-        req.headers =  {
-          'Content-Length' => [1234],
-          'Via' => ['Some Proxy'],
-          'User-Agent' => ['rspec']
-        }
-      end
+      Pacto::RequestClause.new(record_host,
+                               'method' => 'GET',
+                               'path' => '/abcd',
+                               'headers' => {
+                                 'Content-Length' => [1234],
+                                 'Via' => ['Some Proxy'],
+                                 'User-Agent' => ['rspec']
+                               },
+                               'params' => {
+                                 'apikey' => "<%= ENV['MY_API_KEY'] %>"
+                               }
+                              )
     end
-
     let(:response_adapter) do
       Faraday::Response.new(
         :status => 200,
@@ -43,6 +44,34 @@ module Pacto
       MultiJson.encode(obj, :pretty => true).gsub(/^$\n/, '')
     end
 
+    describe '#generate' do
+      let(:request_contract) do
+        double(
+          :request => request
+        )
+      end
+      let(:generated_contract) { double('generated contract') }
+      before do
+        Pacto.should_receive(:load_contract).with(request_file, record_host).and_return request_contract
+        request.should_receive(:execute).and_return response_adapter
+      end
+
+      it 'parses the request' do
+        generator.should_receive(:save).with(request_file, request, anything)
+        generator.generate request_file, record_host
+      end
+
+      it 'fetches a response' do
+        generator.should_receive(:save).with(request_file, anything, response_adapter)
+        generator.generate request_file, record_host
+      end
+
+      it 'saves the result' do
+        generator.should_receive(:save).with(request_file, request, response_adapter).and_return generated_contract
+        expect(generator.generate request_file, record_host).to eq(generated_contract)
+      end
+    end
+
     describe '#save' do
       before do
         filters.should_receive(:filter_request_headers).with(request, response_adapter).and_return filtered_request_headers

data/spec/unit/pacto/logger_spec.rb

@@ -1,44 +1,46 @@
 module Pacto
-  describe Logger do
-    before do
-      logger.log logger_lib
-    end
-
-    subject(:logger) { described_class.instance }
-    let(:logger_lib) { ::Logger.new(StringIO.new) }
-
-    it 'delegates debug to the logger lib' do
-      logger_lib.should_receive(:debug)
-      logger.debug
-    end
-
-    it 'delegates info to the logger lib' do
-      logger_lib.should_receive(:info)
-      logger.info
-    end
-
-    it 'delegates warn to the logger lib' do
-      logger_lib.should_receive(:warn)
-      logger.warn
-    end
-
-    it 'delegates error to the logger lib' do
-      logger_lib.should_receive(:error)
-      logger.error
-    end
-
-    it 'delegates fatal to the logger lib' do
-      logger_lib.should_receive(:error)
-      logger.error
-    end
-
-    it 'has the default log level as error' do
-      expect(logger.level).to eq :error
-    end
-
-    it 'provides access to the log level' do
-      logger.level = :info
-      expect(logger.level).to eq :info
+  module Logger
+    describe SimpleLogger do
+      before do
+        logger.log logger_lib
+      end
+
+      subject(:logger) { described_class.instance }
+      let(:logger_lib) { ::Logger.new(StringIO.new) }
+
+      it 'delegates debug to the logger lib' do
+        logger_lib.should_receive(:debug)
+        logger.debug
+      end
+
+      it 'delegates info to the logger lib' do
+        logger_lib.should_receive(:info)
+        logger.info
+      end
+
+      it 'delegates warn to the logger lib' do
+        logger_lib.should_receive(:warn)
+        logger.warn
+      end
+
+      it 'delegates error to the logger lib' do
+        logger_lib.should_receive(:error)
+        logger.error
+      end
+
+      it 'delegates fatal to the logger lib' do
+        logger_lib.should_receive(:error)
+        logger.error
+      end
+
+      it 'has the default log level as error' do
+        expect(logger.level).to eq :error
+      end
+
+      it 'provides access to the log level' do
+        logger.level = :info
+        expect(logger.level).to eq :info
+      end
     end
   end
 end

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

@@ -39,7 +39,7 @@ module Pacto
         stubbed_request.stub(:to_return).with(
           :status => response.status,
           :headers => response.headers,
-          :body => response.body.to_json,
+          :body => response.body.to_json
         )
         stubbed_request.stub(:request_pattern).and_return request_pattern
       end
@@ -50,7 +50,8 @@ module Pacto
             expect(block.parameters).to have(2).items
           end
 
-          WebMockAdapter.new
+          # WebMockAdapter.new
+          Pacto.configuration.provider # this way the rpec after block doesn't create a second instance
         end
       end
 

data/spec/unit/pacto/validators/body_validator_spec.rb

@@ -2,23 +2,36 @@ module Pacto
   module Validators
     describe BodyValidator do
       class MyBodyValidator < BodyValidator
-        def self.section_name
-          'my_section'
+        class << self
+          attr_writer :subschema
+
+          def section_name
+            'my_section'
+          end
+
+          def subschema(contract)
+            @subschema
+          end
         end
       end
 
       subject(:validator)    { MyBodyValidator }
       let(:string_required)  { true }
+      let(:contract)         { double('contract', :file => 'file:///a.json') }
       let(:body)             { 'a simple string' }
       let(:fake_interaction) { double(:fake_interaction, body: body) }
 
+      before(:each) do
+        MyBodyValidator.subschema = schema
+      end
+
       describe '#validate' do
         context 'when schema is not specified' do
           let(:schema) { nil }
 
           it 'gives no errors without validating body' do
             JSON::Validator.should_not_receive(:fully_validate)
-            expect(validator.validate(schema, fake_interaction)).to be_empty
+            expect(validator.validate(contract, fake_interaction)).to be_empty
           end
         end
 
@@ -31,17 +44,17 @@ module Pacto
             # FIXME: This seems like a design flaw. We're partially reproducing json-schema behavior
             # instead of finding a way to use it.
             JSON::Validator.should_not_receive(:fully_validate)
-            validator.validate(schema, fake_interaction)
+            validator.validate(contract, fake_interaction)
           end
 
           context 'if required' do
             it 'does not return an error when body is a string' do
-              expect(validator.validate(schema, fake_interaction)).to be_empty
+              expect(validator.validate(contract, fake_interaction)).to be_empty
             end
 
             it 'returns an error when body is nil' do
               expect(fake_interaction).to receive(:body).and_return nil
-              expect(validator.validate(schema, fake_interaction).size).to eq 1
+              expect(validator.validate(contract, fake_interaction).size).to eq 1
             end
           end
 
@@ -49,12 +62,12 @@ module Pacto
             let(:string_required) { false }
 
             it 'does not return an error when body is a string' do
-              expect(validator.validate(schema, fake_interaction)).to be_empty
+              expect(validator.validate(contract, fake_interaction)).to be_empty
             end
 
             it 'does not return an error when body is nil' do
               expect(fake_interaction).to receive(:body).and_return nil
-              expect(validator.validate(schema, fake_interaction)).to be_empty
+              expect(validator.validate(contract, fake_interaction)).to be_empty
             end
           end
 
@@ -67,7 +80,7 @@ module Pacto
               let(:body) { 'abc' } # This matches the pattern /a.c/
 
               it 'does not return an error' do
-                expect(validator.validate(schema, fake_interaction)).to be_empty
+                expect(validator.validate(contract, fake_interaction)).to be_empty
               end
             end
 
@@ -75,7 +88,7 @@ module Pacto
               let(:body) { 'acb' } # This does not matches the pattern /a.c/
 
               it 'returns an error' do
-                expect(validator.validate(schema, fake_interaction).size).to eq 1
+                expect(validator.validate(contract, fake_interaction).size).to eq 1
               end
             end
           end
@@ -87,7 +100,7 @@ module Pacto
           context 'when body matches' do
             it 'does not return any errors' do
               expect(JSON::Validator).to receive(:fully_validate).and_return([])
-              expect(validator.validate(schema, fake_interaction)).to be_empty
+              expect(validator.validate(contract, fake_interaction)).to be_empty
             end
           end
 
@@ -95,7 +108,7 @@ module Pacto
             it 'returns a list of errors' do
               errors = double 'some errors'
               expect(JSON::Validator).to receive(:fully_validate).and_return(errors)
-              expect(validator.validate(schema, fake_interaction)).to eq(errors)
+              expect(validator.validate(contract, fake_interaction)).to eq(errors)
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pacto
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - ThoughtWorks & Abril
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
@@ -70,6 +70,9 @@ dependencies:
   name: json-generator
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
@@ -77,6 +80,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
@@ -126,6 +132,9 @@ dependencies:
   name: json-schema-generator
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.7
@@ -133,6 +142,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.7
@@ -154,42 +166,42 @@ dependencies:
   name: coveralls
   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: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rake-notes
   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
@@ -210,128 +222,114 @@ dependencies:
   name: should_not
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: aruba
   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: relish
-  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: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   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: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 description: Pacto is a judge that arbitrates contract disputes between a service
   provider and one or more consumers. In other words, it is a framework for Integration
   Contract Testing, and helps guide service evolution patterns like Consumer-Driven
@@ -349,6 +347,7 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG
 - CONTRIBUTING.md
 - Gemfile
 - Guardfile