vcr 1.10.3 → 1.11.1

data/.travis.yml

@@ -1,6 +1,7 @@
 script: "bundle exec rake ci:build"
 rvm:
+  - 1.8.6
   - 1.8.7
   - 1.9.2
-env:
-  - CI=true
+  - ree
+  - jruby

data/CHANGELOG.md

@@ -1,6 +1,19 @@
 ## In git
 
-[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.10.3...master)
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.11.1...master)
+
+## 1.11.1 (August 18, 2011)
+
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.11.0...v1.11.1)
+
+* Yanked 1.11.0 and rebuilt gem on 1.8.7 to deal with syck/psych
+  incompatibilties in gemspec.
+
+## 1.11.0 (August 18, 2011)
+
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.10.3...v1.11.0)
+
+* Updates to work with WebMock 1.7.0.
 
 ## 1.10.3 (July 21, 2011)
 

data/Gemfile

@@ -30,6 +30,7 @@ group :extras do
 
   platforms :mri_18 do
     gem 'ruby-debug'
+    gem 'linecache', '0.43' # later versions do not work on 1.8.6
   end
 
   platforms :mri_19 do
@@ -37,5 +38,5 @@ group :extras do
     gem 'ruby-debug19'
     gem 'ruby-debug-base19', RUBY_VERSION == '1.9.1' ? '0.11.23' : '~> 0.11.24'
   end
-end
+end unless ENV['CI']
 

data/Rakefile

@@ -44,7 +44,7 @@ namespace :ci do
   end
 
   desc "Run a ci build"
-  task :build => [:setup, :spec, :cucumber]
+  task :build => [:setup, :spec]
 end
 
 def ensure_relish_doc_symlinked(filename)
@@ -78,7 +78,11 @@ task :prep_relish_release do
   ENV['NEW_RELISH_RELEASE'] = 'true'
 end
 
-task :release => [:prep_relish_release, :relish]
+task :require_ruby_18 do
+  raise "This must be run on Ruby 1.8" unless RUBY_VERSION =~ /^1\.8/
+end
+
+task :release => [:require_ruby_18, :prep_relish_release, :relish]
 
 # For gem-test: http://gem-testers.org/
 task :test => :spec

data/features/configuration/stub_with.feature

@@ -41,36 +41,6 @@ Feature: stub_with
   additional features of WebMock) you can change the `stub_with` configuration
   option and it'll work with no other changes required.
 
-  Scenario Outline: stub_with loads the given HTTP stubbing library
-    Given a file named "vcr_stub_with.rb" with:
-      """
-      require 'vcr'
-
-      VCR.config do |c|
-        c.stub_with <stub_with>
-      end
-
-      puts "FakeWeb Loaded: #{!!defined?(FakeWeb)}"
-      puts "WebMock Loaded: #{!!defined?(WebMock)}"
-      puts "Typhoeus Loaded: #{!!defined?(Typhoeus)}"
-      puts "Excon Loaded: #{!!defined?(Excon)}"
-      """
-    When I run "ruby vcr_stub_with.rb"
-    Then the output should contain:
-      """
-      FakeWeb Loaded: <fakeweb_loaded>
-      WebMock Loaded: <webmock_loaded>
-      Typhoeus Loaded: <typhoeus_loaded>
-      Excon Loaded: <excon_loaded>
-      """
-
-    Examples:
-      | stub_with | fakeweb_loaded | webmock_loaded | typhoeus_loaded | excon_loaded |
-      | :fakeweb  | true           | false          | false           | false        |
-      | :webmock  | false          | true           | false           | false        |
-      | :typhoeus | false          | false          | true            | false        |
-      | :excon    | false          | false          | false           | true         |
-
   Scenario Outline: Record and replay a request using each supported stubbing/http library combination
     Given a file named "stubbing_http_lib_combo.rb" with:
       """

data/lib/vcr.rb

@@ -99,7 +99,9 @@ module VCR
 
       adapters = VCR::Config.http_stubbing_libraries.map { |l| adapter_for(l) }
       raise ArgumentError.new("The http stubbing library is not configured.") if adapters.empty?
-      HttpStubbingAdapters::MultiObjectProxy.for(*adapters)
+      adapter = HttpStubbingAdapters::MultiObjectProxy.for(*adapters)
+      adapter.after_adapters_loaded
+      adapter
     end
   end
 

data/lib/vcr/http_stubbing_adapters/common.rb

@@ -37,6 +37,10 @@ module VCR
         [nil, self].include? VCR::HttpStubbingAdapters::Common.exclusively_enabled_adapter
       end
 
+      def after_adapters_loaded
+        # no-op
+      end
+
       def exclusively_enabled
         VCR::HttpStubbingAdapters::Common.exclusively_enabled_adapter = self
 
@@ -64,12 +68,89 @@ module VCR
         self.http_connections_allowed = VCR::Config.allow_http_connections_when_no_cassette?
       end
 
-      def restore_stubs_checkpoint(cassette)
+      def raise_no_checkpoint_error(cassette)
         raise ArgumentError.new("No checkpoint for #{cassette.inspect} could be found")
       end
 
+      attr_writer :http_connections_allowed
+
+      def http_connections_allowed?
+        !!@http_connections_allowed
+      end
+
+      def ignored_hosts=(hosts)
+        @ignored_hosts = hosts
+      end
+
+      def uri_should_be_ignored?(uri)
+        uri = URI.parse(uri) unless uri.respond_to?(:host)
+        ignored_hosts.include?(uri.host)
+      end
+
+      def stub_requests(http_interactions, match_attributes)
+        match_attributes_stack << match_attributes
+        grouped_responses(http_interactions, match_attributes).each do |request_matcher, responses|
+          request_matcher = request_matcher_with_normalized_uri(request_matcher)
+          queue = stub_queues[request_matcher]
+          responses.each { |res| queue << res }
+        end
+      end
+
+      def create_stubs_checkpoint(cassette)
+        checkpoints[cassette] = stub_queue_dup
+      end
+
+      def restore_stubs_checkpoint(cassette)
+        match_attributes_stack.pop
+        @stub_queues = checkpoints.delete(cassette) || raise_no_checkpoint_error(cassette)
+      end
+
+      def stubbed_response_for(request)
+        return nil unless match_attributes_stack.any?
+        request_matcher = request.matcher(match_attributes_stack.last)
+        queue = stub_queues[request_matcher]
+        return queue.shift if queue.size > 1
+        queue.first
+      end
+
+      def reset!
+        instance_variables.each do |ivar|
+          remove_instance_variable(ivar)
+        end
+      end
+
       private
 
+      def ignored_hosts
+        @ignored_hosts ||= []
+      end
+
+      def checkpoints
+        @checkpoints ||= {}
+      end
+
+      def stub_queues
+        @stub_queues ||= hash_of_arrays
+      end
+
+      def match_attributes_stack
+        @match_attributes_stack ||= []
+      end
+
+      def stub_queue_dup
+        dup = hash_of_arrays
+
+        stub_queues.each do |k, v|
+          dup[k] = v.dup
+        end
+
+        dup
+      end
+
+      def hash_of_arrays
+        Hash.new { |h, k| h[k] = [] }
+      end
+
       def compare_version
         major,     minor,     patch     = parse_version(version)
         min_major, min_minor, min_patch = parse_version(self::MINIMUM_VERSION)
@@ -102,6 +183,20 @@ module VCR
 
         responses
       end
+
+      def normalize_uri(uri)
+        uri # adapters can override this
+      end
+
+      def request_matcher_with_normalized_uri(matcher)
+        normalized_uri = normalize_uri(matcher.request.uri)
+        return matcher unless matcher.request.uri != normalized_uri
+
+        request = matcher.request.dup
+        request.uri = normalized_uri
+
+        RequestMatcher.new(request, matcher.match_attributes)
+      end
     end
   end
 end

data/lib/vcr/http_stubbing_adapters/excon.rb

@@ -11,87 +11,11 @@ module VCR
       MINIMUM_VERSION = '0.6.5'
       MAXIMUM_VERSION = '0.6'
 
-      attr_writer :http_connections_allowed
-
-      def http_connections_allowed?
-        !!@http_connections_allowed
-      end
-
-      def ignored_hosts=(hosts)
-        @ignored_hosts = hosts
-      end
-
-      def uri_should_be_ignored?(uri)
-        uri = URI.parse(uri) unless uri.respond_to?(:host)
-        ignored_hosts.include?(uri.host)
-      end
-
-      def stub_requests(http_interactions, match_attributes)
-        match_attributes_stack << match_attributes
-        grouped_responses(http_interactions, match_attributes).each do |request_matcher, responses|
-          queue = stub_queues[request_matcher]
-          responses.each { |res| queue << res }
-        end
-      end
-
-      def create_stubs_checkpoint(cassette)
-        checkpoints[cassette] = stub_queue_dup
-      end
-
-      def restore_stubs_checkpoint(cassette)
-        match_attributes_stack.pop
-        @stub_queues = checkpoints.delete(cassette) || super
-      end
-
-      def stubbed_response_for(request)
-        return nil unless match_attributes_stack.any?
-        request_matcher = request.matcher(match_attributes_stack.last)
-        queue = stub_queues[request_matcher]
-        return queue.shift if queue.size > 1
-        queue.first
-      end
-
-      def reset!
-        instance_variables.each do |ivar|
-          remove_instance_variable(ivar)
-        end
-      end
-
       private
 
-        def version
-          ::Excon::VERSION
-        end
-
-        def ignored_hosts
-          @ignored_hosts ||= []
-        end
-
-        def checkpoints
-          @checkpoints ||= {}
-        end
-
-        def stub_queues
-          @stub_queues ||= hash_of_arrays
-        end
-
-        def match_attributes_stack
-          @match_attributes_stack ||= []
-        end
-
-        def stub_queue_dup
-          dup = hash_of_arrays
-
-          stub_queues.each do |k, v|
-            dup[k] = v.dup
-          end
-
-          dup
-        end
-
-        def hash_of_arrays
-          Hash.new { |h, k| h[k] = [] }
-        end
+      def version
+        ::Excon::VERSION
+      end
 
       class RequestHandler
         attr_reader :params

data/lib/vcr/http_stubbing_adapters/fakeweb.rb

@@ -44,7 +44,7 @@ module VCR
       end
 
       def restore_stubs_checkpoint(cassette)
-        ::FakeWeb::Registry.instance.uri_map = checkpoints.delete(cassette) || super
+        ::FakeWeb::Registry.instance.uri_map = checkpoints.delete(cassette) || raise_no_checkpoint_error(cassette)
       end
 
       def request_stubbed?(request, match_attributes)

data/lib/vcr/http_stubbing_adapters/faraday.rb

@@ -9,89 +9,16 @@ module VCR
       MINIMUM_VERSION = '0.6.0'
       MAXIMUM_VERSION = '0.6'
 
-      attr_writer :http_connections_allowed
-
-      def http_connections_allowed?
-        !!@http_connections_allowed
-      end
-
-      def ignored_hosts=(hosts)
-        @ignored_hosts = hosts
-      end
-
-      def uri_should_be_ignored?(uri)
-        uri = URI.parse(uri) unless uri.respond_to?(:host)
-        ignored_hosts.include?(uri.host)
-      end
-
-      def stub_requests(http_interactions, match_attributes)
-        grouped_responses(http_interactions, match_attributes).each do |request_matcher, responses|
-          matcher = request_matcher_with_normalized_uri(request_matcher)
-          queue = stub_queues[matcher]
-          responses.each { |res| queue << res }
-        end
-      end
-
-      def create_stubs_checkpoint(cassette)
-        checkpoints[cassette] = stub_queue_dup
-      end
-
-      def restore_stubs_checkpoint(cassette)
-        @stub_queues = checkpoints.delete(cassette) || super
-      end
+      private
 
-      def stubbed_response_for(request_matcher)
-        queue = stub_queues[request_matcher]
-        return queue.shift if queue.size > 1
-        queue.first
+      def version
+        ::Faraday::VERSION
       end
 
-      def reset!
-        instance_variables.each do |ivar|
-          remove_instance_variable(ivar)
-        end
+      def normalize_uri(uri)
+        # faraday normalizes +'s to %20's
+        uri.gsub('+', '%20')
       end
-
-      private
-
-        def version
-          ::Faraday::VERSION
-        end
-
-        def ignored_hosts
-          @ignored_hosts ||= []
-        end
-
-        def checkpoints
-          @checkpoints ||= {}
-        end
-
-        def stub_queues
-          @stub_queues ||= hash_of_arrays
-        end
-
-        def stub_queue_dup
-          dup = hash_of_arrays
-
-          stub_queues.each do |k, v|
-            dup[k] = v.dup
-          end
-
-          dup
-        end
-
-        def hash_of_arrays
-          Hash.new { |h, k| h[k] = [] }
-        end
-
-        def request_matcher_with_normalized_uri(matcher)
-          return matcher unless matcher.uri.is_a?(String) && matcher.uri.include?('+')
-
-          request = matcher.request.dup
-          request.uri = request.uri.gsub('+', '%20')
-
-          RequestMatcher.new(request, matcher.match_attributes)
-        end
     end
   end
 end

data/lib/vcr/http_stubbing_adapters/typhoeus.rb

@@ -44,7 +44,15 @@ module VCR
       end
 
       def restore_stubs_checkpoint(cassette)
-        ::Typhoeus::Hydra.stubs = checkpoints.delete(cassette) || super
+        ::Typhoeus::Hydra.stubs = checkpoints.delete(cassette) || raise_no_checkpoint_error(cassette)
+      end
+
+      def after_adapters_loaded
+        # ensure WebMock's Typhoeus adapter does not conflict with us here
+        # (i.e. to double record requests or whatever).
+        if defined?(::WebMock::HttpLibAdapters::TyphoeusAdapter)
+          ::WebMock::HttpLibAdapters::TyphoeusAdapter.disable!
+        end
       end
 
       private

data/lib/vcr/http_stubbing_adapters/webmock.rb

@@ -6,8 +6,8 @@ module VCR
       include VCR::HttpStubbingAdapters::Common
       extend self
 
-      MINIMUM_VERSION = '1.6.0'
-      MAXIMUM_VERSION = '1.6'
+      MINIMUM_VERSION = '1.7.0'
+      MAXIMUM_VERSION = '1.7'
 
       def http_connections_allowed=(value)
         @http_connections_allowed = value
@@ -39,7 +39,7 @@ module VCR
       end
 
       def restore_stubs_checkpoint(cassette)
-        ::WebMock::StubRegistry.instance.request_stubs = checkpoints.delete(cassette) || super
+        ::WebMock::StubRegistry.instance.request_stubs = checkpoints.delete(cassette) || raise_no_checkpoint_error(cassette)
       end
 
       private

data/lib/vcr/middleware/faraday.rb

@@ -11,11 +11,10 @@ module VCR
         VCR::HttpStubbingAdapters::Faraday.exclusively_enabled do
           VCR.use_cassette(*cassette_arguments(env)) do |cassette|
             request = request_for(env)
-            request_matcher = request.matcher(cassette.match_requests_on)
 
             if VCR::HttpStubbingAdapters::Faraday.uri_should_be_ignored?(request.uri)
               @app.call(env)
-            elsif response = VCR::HttpStubbingAdapters::Faraday.stubbed_response_for(request_matcher)
+            elsif response = VCR::HttpStubbingAdapters::Faraday.stubbed_response_for(request)
               headers = env[:response_headers] ||= ::Faraday::Utils::Headers.new
               headers.update response.headers if response.headers
               env.update :status => response.status.code, :body => response.body

data/lib/vcr/version.rb

@@ -3,7 +3,7 @@ module VCR
 
   def version
     @version ||= begin
-      string = '1.10.3'
+      string = '1.11.1'
 
       def string.parts
         split('.').map { |p| p.to_i }

data/spec/monkey_patches.rb

@@ -12,9 +12,14 @@ module MonkeyPatches
 
   def enable!(scope)
     case scope
-      when :all
-        MONKEY_PATCHES.each do |mp|
-          realias mp.first, mp.last, :with_monkeypatches
+      when :fakeweb
+        realias_all :with_fakeweb
+        enable!(:vcr) # fakeweb adapter relies upon VCR's Net::HTTP monkey patch
+      when :webmock
+        ::WebMock::HttpLibAdapters::NetHttpAdapter.enable!
+        ::WebMock::HttpLibAdapters::TyphoeusAdapter.enable! unless RUBY_INTERPRETER == :jruby
+        $original_webmock_callbacks.each do |cb|
+          ::WebMock::CallbackRegistry.add_callback(cb[:options], cb[:block])
         end
       when :vcr
         realias Net::HTTP, :request, :with_vcr
@@ -22,15 +27,13 @@ module MonkeyPatches
     end
   end
 
-  def disable!(scope)
-    case scope
-      when :all
-        MONKEY_PATCHES.each do |mp|
-          realias mp.first, mp.last, :without_monkeypatches
-        end
-      when :vcr
-        realias Net::HTTP, :request, :without_vcr
-      else raise ArgumentError.new("Unexpected scope: #{scope}")
+  def disable_all!
+    realias_all :without_monkeypatches
+
+    if defined?(::WebMock)
+      ::WebMock::HttpLibAdapters::NetHttpAdapter.disable!
+      ::WebMock::HttpLibAdapters::TyphoeusAdapter.disable! unless RUBY_INTERPRETER == :jruby
+      ::WebMock::CallbackRegistry.reset
     end
   end
 
@@ -45,13 +48,7 @@ module MonkeyPatches
 
   def capture_method_definition(klass, method, original)
     klass.class_eval do
-      monkeypatch_methods = [
-        :with_vcr,     :without_vcr,
-        :with_fakeweb, :without_fakeweb,
-        :with_webmock, :without_webmock
-      ].select do |m|
-        method_defined?(:"#{method}_#{m}")
-      end
+      monkeypatch_methods = [:vcr, :fakeweb].select { |m| method_defined?(:"#{method}_with_#{m}") }
 
       if original
         if monkeypatch_methods.size > 0
@@ -78,6 +75,12 @@ module MonkeyPatches
   def realias(klass, method, alias_extension)
     klass.class_eval { alias_method method, :"#{method}_#{alias_extension}" }
   end
+
+  def realias_all(alias_extension)
+    MONKEY_PATCHES.each do |mp|
+      realias mp.first, mp.last, alias_extension
+    end
+  end
 end
 
 # Require all the HTTP libraries--these must be required before WebMock
@@ -91,13 +94,26 @@ if RUBY_INTERPRETER == :mri
   require 'typhoeus'
 end
 
-# The FakeWeb adapter must be required after WebMock's so
-# that VCR's Net::HTTP monkey patch is loaded last.
-# This allows us to disable it (i.e. by realiasing to
-# the version of Net::HTTP's methods before it was loaded)
-require 'vcr/http_stubbing_adapters/webmock'
 require 'vcr/http_stubbing_adapters/fakeweb'
 
 # All Net::HTTP monkey patches have now been loaded, so capture the
 # appropriate method definitions so we can disable them later.
 MonkeyPatches.init
+
+# Disable FakeWeb/VCR Net::HTTP patches before WebMock
+# subclasses Net::HTTP and inherits them...
+MonkeyPatches.disable_all!
+
+require 'vcr/http_stubbing_adapters/webmock'
+$original_webmock_callbacks = ::WebMock::CallbackRegistry.callbacks
+
+# disable all by default; we'll enable specific ones when we need them
+MonkeyPatches.disable_all!
+
+RSpec.configure do |config|
+  [:fakeweb, :webmock, :vcr].each do |scope|
+    config.before(:all, :with_monkey_patches => scope) { MonkeyPatches.enable!(scope) }
+    config.after(:all,  :with_monkey_patches => scope) { MonkeyPatches.disable_all!   }
+  end
+end
+

data/spec/spec_helper.rb

@@ -41,7 +41,7 @@ end
 
 RSpec.configure do |config|
   config.color_enabled = true
-  config.debug = (using_git && RUBY_INTERPRETER == :mri && RUBY_VERSION != '1.9.1')
+  config.debug = (using_git && RUBY_INTERPRETER == :mri && RUBY_VERSION != '1.9.1' && !ENV['CI'])
   config.treat_symbols_as_metadata_keys_with_true_values = true
 
   tmp_dir = File.expand_path('../../tmp/cassette_library_dir', __FILE__)
@@ -78,22 +78,6 @@ RSpec.configure do |config|
     $stderr = @orig_std_err
   end
 
-  config.before(:all, :without_webmock_callbacks => true) do
-    @original_webmock_callbacks = ::WebMock::CallbackRegistry.callbacks
-    ::WebMock::CallbackRegistry.reset
-  end
-
-  config.after(:all, :without_webmock_callbacks => true) do
-    @original_webmock_callbacks.each do |cb|
-      ::WebMock::CallbackRegistry.add_callback(cb[:options], cb[:block])
-    end
-  end
-
-  [:all, :vcr].each do |scope|
-    config.before(:each, :without_monkey_patches => scope) { MonkeyPatches.disable!(scope) }
-    config.after(:each, :without_monkey_patches => scope)  { MonkeyPatches.enable!(scope)  }
-  end
-
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
 

data/spec/support/vcr_localhost_server.rb

@@ -41,7 +41,7 @@ module VCR
     def boot
       # Use WEBrick since it's part of the ruby standard library and is available on all ruby interpreters.
       options = { :Port => port }
-      options.merge!(:AccessLog => [], :Logger => WEBrick::BasicLog.new(StringIO.new)) unless ENV['CI']
+      options.merge!(:AccessLog => [], :Logger => WEBrick::BasicLog.new(StringIO.new)) unless ENV['VERBOSE_SERVER']
       Rack::Handler::WEBrick.run(Identify.new(@rack_app), options)
     end
 

data/spec/vcr/cassette_spec.rb

@@ -449,7 +449,7 @@ describe VCR::Cassette do
             end
 
             it "matches old requests to new ones using the cassette's match attributes" do
-              pending("Need to fix this to work with Psych", :if => defined?(::Psych) && !ENV['CI']) do
+              pending("Need to fix this to work with Psych", :if => defined?(::Psych)) do
                 [
                   old_interaction_1, old_interaction_2, old_interaction_3,
                   new_interaction_1, new_interaction_2, new_interaction_3
@@ -459,7 +459,7 @@ describe VCR::Cassette do
 
                 subject.eject
               end
-            end
+            end unless ENV['CI']
           else
             it 'saves the old interactions followed by the new ones to disk' do
               subject.eject

data/spec/vcr/extensions/net_http_response_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe VCR::Net::HTTPResponse, :without_monkey_patches => :all do
+describe VCR::Net::HTTPResponse do
   def self.it_allows_the_body_to_be_read(expected_regex)
     it 'allows the body to be read using #body' do
       response.body.to_s.should =~ expected_regex
@@ -54,7 +54,7 @@ describe VCR::Net::HTTPResponse, :without_monkey_patches => :all do
           http = Net::HTTP.new('localhost', VCR::SinatraApp.port)
           res = http.send(http_verb_method, '/', &block)
           res.should_not be_a(VCR::Net::HTTPResponse)
-          res.should_not be_a(::WebMock::Net::HTTPResponse)
+          res.should_not be_a(::Net::WebMockHTTPResponse)
           res
         end
       end

data/spec/vcr/extensions/net_http_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Net::HTTP Extensions", :without_webmock_callbacks => true do
+describe "Net::HTTP Extensions", :with_monkey_patches => :vcr do
   before(:all) { VCR::SinatraApp.port } # ensure the server is started before instantiating any Net::HTTP instances
 
   let(:uri) { URI.parse("http://localhost:#{VCR::SinatraApp.port}/") }

data/spec/vcr/http_stubbing_adapters/excon_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe VCR::HttpStubbingAdapters::Excon, :without_monkey_patches => :vcr do
+describe VCR::HttpStubbingAdapters::Excon do
   it_behaves_like 'an http stubbing adapter',
     ['excon'],
     [:method, :uri, :host, :path, :body, :headers],

data/spec/vcr/http_stubbing_adapters/fakeweb_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe VCR::HttpStubbingAdapters::FakeWeb, :without_webmock_callbacks => true do
+describe VCR::HttpStubbingAdapters::FakeWeb, :with_monkey_patches => :fakeweb do
   it_behaves_like 'an http stubbing adapter', ['net/http'], [:method, :uri, :host, :path], :needs_net_http_extension
 
   it_performs('version checking',

data/spec/vcr/http_stubbing_adapters/faraday_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe VCR::HttpStubbingAdapters::Faraday, :without_monkey_patches => :all do
+describe VCR::HttpStubbingAdapters::Faraday do
   it_behaves_like 'an http stubbing adapter',
     %w[ faraday-typhoeus faraday-net_http faraday-patron ],
     [:method, :uri, :host, :path, :body, :headers],
@@ -27,8 +27,7 @@ describe VCR::HttpStubbingAdapters::Faraday, :without_monkey_patches => :all do
     let(:match_attributes) { [:method, :uri] }
 
     def stubbed_response_for(request)
-      matcher = VCR::RequestMatcher.new(request, match_attributes)
-      subject.stubbed_response_for(matcher)
+      subject.stubbed_response_for(request)
     end
 
     before(:each) do
@@ -72,12 +71,6 @@ describe VCR::HttpStubbingAdapters::Faraday, :without_monkey_patches => :all do
         subject.restore_stubs_checkpoint(cassette_1)
         test_stubbed_responses
       end
-
-      it 'restores the queues to the checkpoint state when a queue has been used' do
-        stubbed_response_for(request_1)
-        subject.restore_stubs_checkpoint(cassette_1)
-        test_stubbed_responses
-      end
     end
   end
 end

data/spec/vcr/http_stubbing_adapters/typhoeus_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe VCR::HttpStubbingAdapters::Typhoeus, :without_monkey_patches => :vcr do
+describe VCR::HttpStubbingAdapters::Typhoeus do
   before(:each) do
     ::Typhoeus::Hydra.stubs = []
     ::Typhoeus::Hydra.allow_net_connect = true
@@ -21,5 +21,12 @@ describe VCR::HttpStubbingAdapters::Typhoeus, :without_monkey_patches => :vcr do
       Typhoeus::VERSION = version
     end
   end
+
+  describe ".after_adapters_loaded" do
+    it 'disables the webmock typhoeus adapter so it does not conflict with our typhoeus adapter' do
+      ::WebMock::HttpLibAdapters::TyphoeusAdapter.should_receive(:disable!)
+      described_class.after_adapters_loaded
+    end
+  end
 end unless RUBY_PLATFORM == 'java'
 

data/spec/vcr/http_stubbing_adapters/webmock_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-describe VCR::HttpStubbingAdapters::WebMock, :without_monkey_patches => :vcr do
+describe VCR::HttpStubbingAdapters::WebMock, :with_monkey_patches => :webmock do
   it_behaves_like 'an http stubbing adapter',
     %w[net/http patron httpclient em-http-request curb],
     [:method, :uri, :host, :path, :body, :headers]
 
   it_performs('version checking',
-    :valid    => %w[ 1.6.0 1.6.99 ],
-    :too_low  => %w[ 0.9.9 0.9.10 0.1.30 1.0.30 1.2.9 1.3.9 ],
-    :too_high => %w[ 1.7.0 1.10.0 2.0.0 ]
+    :valid    => %w[ 1.7.0 1.7.99 ],
+    :too_low  => %w[ 0.9.9 0.9.10 0.1.30 1.0.30 1.6.9 ],
+    :too_high => %w[ 1.8.0 1.10.0 2.0.0 ]
   ) do
     def stub_version(version)
       WebMock.stub(:version).and_return(version)

data/spec/vcr_spec.rb

@@ -156,6 +156,12 @@ describe VCR do
       end
     end
 
+    it 'calls #after_adapters_loaded on the configured stubbing adapter' do
+      VCR::HttpStubbingAdapters::FakeWeb.should_receive(:after_adapters_loaded)
+      VCR::Config.stub_with :fakeweb
+      VCR.http_stubbing_adapter
+    end
+
     it 'raises an error if both :fakeweb and :webmock are configured' do
       VCR::Config.stub_with :fakeweb, :webmock
 

data/vcr.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
     'shoulda'         => '~> 2.9.2',
 
     'fakeweb'         => '~> 1.3.0',
-    'webmock'         => '~> 1.6.4',
+    'webmock'         => '~> 1.7.4',
     'addressable'     => '~> 2.2.6',
 
     'faraday'         => '~> 0.7.2',

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 1
-  - 10
-  - 3
-  version: 1.10.3
+  - 11
+  - 1
+  version: 1.11.1
 platform: ruby
 authors: 
 - Myron Marston
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-21 00:00:00 -07:00
-default_executable: 
+date: 2011-08-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -30,10 +29,10 @@ dependencies:
         - 7
         - 2
         version: 0.7.2
-  requirement: *id001
-  prerelease: false
   name: faraday
   type: :development
+  prerelease: false
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -46,10 +45,10 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  requirement: *id002
-  prerelease: false
   name: fakeweb
   type: :development
+  prerelease: false
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -63,10 +62,10 @@ dependencies:
         - 5
         - 2
         version: 2.1.5.2
-  requirement: *id003
-  prerelease: false
   name: httpclient
   type: :development
+  prerelease: false
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -79,10 +78,10 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  requirement: *id004
-  prerelease: false
   name: rake
   type: :development
+  prerelease: false
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -95,10 +94,10 @@ dependencies:
         - 3
         - 5
         version: 0.3.5
-  requirement: *id005
-  prerelease: false
   name: timecop
   type: :development
+  prerelease: false
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -111,10 +110,10 @@ dependencies:
         - 2
         - 6
         version: 2.2.6
-  requirement: *id006
-  prerelease: false
   name: addressable
   type: :development
+  prerelease: false
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -127,10 +126,10 @@ dependencies:
         - 9
         - 2
         version: 2.9.2
-  requirement: *id007
-  prerelease: false
   name: shoulda
   type: :development
+  prerelease: false
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -142,10 +141,10 @@ dependencies:
         - 2
         - 6
         version: "2.6"
-  requirement: *id008
-  prerelease: false
   name: rspec
   type: :development
+  prerelease: false
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -158,10 +157,10 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
-  requirement: *id009
-  prerelease: false
   name: rack
   type: :development
+  prerelease: false
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -174,10 +173,10 @@ dependencies:
         - 2
         - 4
         version: 0.2.4
-  requirement: *id010
-  prerelease: false
   name: aruba
   type: :development
+  prerelease: false
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -190,10 +189,10 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
-  requirement: *id011
-  prerelease: false
   name: sinatra
   type: :development
+  prerelease: false
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
@@ -206,10 +205,10 @@ dependencies:
         - 0
         - 7
         version: 1.0.7
-  requirement: *id012
-  prerelease: false
   name: bundler
   type: :development
+  prerelease: false
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
@@ -222,10 +221,10 @@ dependencies:
         - 6
         - 5
         version: 0.6.5
-  requirement: *id013
-  prerelease: false
   name: excon
   type: :development
+  prerelease: false
+  requirement: *id013
 - !ruby/object:Gem::Dependency 
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
@@ -238,26 +237,26 @@ dependencies:
         - 9
         - 4
         version: 0.9.4
-  requirement: *id014
-  prerelease: false
   name: cucumber
   type: :development
+  prerelease: false
+  requirement: *id014
 - !ruby/object:Gem::Dependency 
   version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 1
-        - 6
+        - 7
         - 4
-        version: 1.6.4
-  requirement: *id015
-  prerelease: false
+        version: 1.7.4
   name: webmock
   type: :development
+  prerelease: false
+  requirement: *id015
 - !ruby/object:Gem::Dependency 
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
@@ -270,10 +269,10 @@ dependencies:
         - 7
         - 8
         version: 0.7.8
-  requirement: *id016
-  prerelease: false
   name: curb
   type: :development
+  prerelease: false
+  requirement: *id016
 - !ruby/object:Gem::Dependency 
   version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
@@ -286,10 +285,10 @@ dependencies:
         - 4
         - 9
         version: 0.4.9
-  requirement: *id017
-  prerelease: false
   name: patron
   type: :development
+  prerelease: false
+  requirement: *id017
 - !ruby/object:Gem::Dependency 
   version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
@@ -302,10 +301,10 @@ dependencies:
         - 3
         - 0
         version: 0.3.0
-  requirement: *id018
-  prerelease: false
   name: em-http-request
   type: :development
+  prerelease: false
+  requirement: *id018
 - !ruby/object:Gem::Dependency 
   version_requirements: &id019 !ruby/object:Gem::Requirement 
     none: false
@@ -318,10 +317,10 @@ dependencies:
         - 2
         - 1
         version: 0.2.1
-  requirement: *id019
-  prerelease: false
   name: typhoeus
   type: :development
+  prerelease: false
+  requirement: *id019
 description: VCR provides a simple API to record and replay your test suite's HTTP interactions.  It works with a variety of HTTP client libraries, HTTP stubbing libraries and testing frameworks.
 email: myron.marston@gmail.com
 executables: []
@@ -485,7 +484,6 @@ files:
 - spec/vcr/version_spec.rb
 - spec/vcr_spec.rb
 - vcr.gemspec
-has_rdoc: true
 homepage: http://github.com/myronmarston/vcr
 licenses: []
 
@@ -519,7 +517,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests.