vcr 2.2.2 → 2.2.3

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 [Full Changelog](http://github.com/myronmarston/vcr/compare/v2.2.2...master)
 
+Bug Fixes:
+
+* Fix FakeWeb library hook so that it properly handles the case where
+  multiple requests are made using the same Net::HTTP request object.
+  Previously, a `NoMethodError` was raised. Thanks to [Jacob
+  Green](https://github.com/Jacobkg) for helping to troubleshoot
+  this bug!
+
 ## 2.2.2 (June 15, 2012)
 
 [Full Changelog](http://github.com/myronmarston/vcr/compare/v2.2.1...v2.2.2)

data/README.md

@@ -106,7 +106,8 @@ Note that as of VCR 2, 1.8.6 and 1.9.1 are not supported.
 ## Development
 
 * Source hosted on [GitHub](http://github.com/myronmarston/vcr).
-* Direct questions and discussions to the [mailing list](http://groups.google.com/group/vcr-ruby).
+* Direct questions and discussions to the [IRC channel](irc://irc.freenode.net/vcr) or
+  the [mailing list](http://groups.google.com/group/vcr-ruby).
 * Report issues on [GitHub Issues](http://github.com/myronmarston/vcr/issues).
 * Pull requests are very welcome! Please include spec and/or feature coverage for every patch,
   and create a topic branch for every separate change you make.

data/lib/vcr/library_hooks/excon.rb

@@ -2,7 +2,7 @@ require 'vcr/util/version_checker'
 require 'vcr/request_handler'
 require 'excon'
 
-VCR::VersionChecker.new('Excon', Excon::VERSION, '0.9.6', '0.13').check_version!
+VCR::VersionChecker.new('Excon', Excon::VERSION, '0.9.6', '0.14').check_version!
 
 module VCR
   class LibraryHooks

data/lib/vcr/library_hooks/fakeweb.rb

@@ -17,13 +17,7 @@ module VCR
         def initialize(net_http, request, request_body = nil, &response_block)
           @net_http, @request, @request_body, @response_block =
            net_http,  request,  request_body,  response_block
-          @vcr_response, @recursing = nil, false
-
-          if ([:@__vcr_request_type, "@__vcr_request_type"] & request.instance_variables).any?
-            @request_type = request.instance_variable_get(:@__vcr_request_type)
-          else
-            @request_type = nil
-          end
+          @stubbed_response, @vcr_response, @recursing = nil, nil, false
         end
 
         def handle
@@ -32,42 +26,12 @@ module VCR
           invoke_after_request_hook(@vcr_response) unless @recursing
         end
 
-        class << self
-          def already_seen_requests
-            @already_seen_requests ||= Set.new
-          end
-        end
-
       private
 
         def externally_stubbed?
           ::FakeWeb.registered_uri?(request_method, uri)
         end
 
-        def request_type(*args)
-          @request_type || super
-        end
-
-        def set_typed_request_for_after_hook(request_type)
-          @request.instance_variable_set(:@__vcr_request_type, request_type)
-          super
-        end
-
-        def invoke_before_request_hook
-          unless self.class.already_seen_requests.include?(request.object_id)
-            super
-            # we use the object_id so that if there is bug that causes
-            # us not to fully cleanup, we'll only be leaking the memory
-            # of one integer, not the whole request object.
-            self.class.already_seen_requests << request.object_id
-          end
-        end
-
-        def invoke_after_request_hook(vcr_response)
-          self.class.already_seen_requests.delete(request.object_id)
-          super
-        end
-
         def on_externally_stubbed_request
           # just perform the request--FakeWeb will handle it
           perform_request(:started)
@@ -95,6 +59,7 @@ module VCR
           # that is the final time through #request.
           unless started
             @recursing = true
+            request.instance_variable_set(:@__vcr_request_handler, recursive_request_handler)
             return net_http.request_without_vcr(request, request_body, &response_block)
           end
 
@@ -152,6 +117,34 @@ module VCR
             response.body,
             response.http_version
         end
+
+        def recursive_request_handler
+          @recursive_request_handler ||= RecursiveRequestHandler.new(
+            @after_hook_typed_request.type, @stubbed_response, @vcr_request,
+            @net_http, @request, @request_body, &@response_block
+          )
+        end
+      end
+
+      class RecursiveRequestHandler < RequestHandler
+        attr_reader :stubbed_response
+
+        def initialize(request_type, stubbed_response, vcr_request, *args, &response_block)
+          @request_type, @stubbed_response, @vcr_request =
+           request_type,  stubbed_response,  vcr_request
+          super(*args)
+        end
+
+        def handle
+          set_typed_request_for_after_hook(@request_type)
+          send "on_#{@request_type}_request"
+        ensure
+          invoke_after_request_hook(@vcr_response)
+        end
+
+        def request_type(*args)
+          @request_type
+        end
       end
     end
   end
@@ -162,13 +155,15 @@ module Net
   # @private
   class HTTP
     unless method_defined?(:request_with_vcr)
-      def request_with_vcr(*args, &block)
+      def request_with_vcr(request, *args, &block)
         if VCR.turned_on?
-          VCR::LibraryHooks::FakeWeb::RequestHandler.new(
-            self, *args, &block
-          ).handle
+          handler = request.instance_eval do
+            remove_instance_variable(:@__vcr_request_handler) if defined?(@__vcr_request_handler)
+          end || VCR::LibraryHooks::FakeWeb::RequestHandler.new(self, request, *args, &block)
+
+          handler.handle
         else
-          request_without_vcr(*args, &block)
+          request_without_vcr(request, *args, &block)
         end
       end
 

data/lib/vcr/request_handler.rb

@@ -15,10 +15,10 @@ module VCR
       # (i.e. by inserting a cassette), so we need to query the
       # request type again.
       #
-      # Likewise, the main handler logic an modify what
+      # Likewise, the main handler logic can modify what
       # #request_type would return (i.e. when a response stub is
       # used), so we need to store the request type for the
-      # the after_request hook.
+      # after_request hook.
       set_typed_request_for_after_hook(req_type)
 
       send "on_#{req_type}_request"

data/lib/vcr/version.rb

@@ -10,7 +10,7 @@ module VCR
   #   * `parts` [Array<Integer>] List of the version parts.
   def version
     @version ||= begin
-      string = '2.2.2'
+      string = '2.2.3'
 
       def string.parts
         split('.').map { |p| p.to_i }

data/spec/capture_warnings.rb

@@ -14,6 +14,14 @@ RSpec.configure do |config|
 
     vcr_warnings, other_warnings = lines.partition { |line| line.include?(current_dir) }
 
+    # After upgrading to curb 0.8.1, I started to get a circular require
+    # warning from spec_helper and monkey_patches.rb even though there doesn't
+    # appear to be a circular require going on...
+    vcr_warnings.reject! do |line|
+      line.include?("#{current_dir}/spec/spec_helper.rb") ||
+      line.include?("#{current_dir}/spec/monkey_patches.rb")
+    end
+
     # For some weird reason, JRuby is giving me some warnings about
     # `@proxy` not being initialized, and putting a vcr file/line number
     # in the warning, but it's really happening in excon.

data/spec/vcr/extensions/net_http_response_spec.rb

@@ -25,7 +25,7 @@ describe VCR::Net::HTTPResponse do
 
     it 'raises an ArgumentError if both a destination string and a block is given to #read_body' do
       dest = ''
-      expect { response { |r| r.read_body(dest) { |s| } } }.should raise_error(ArgumentError, 'both arg and block given for HTTP method')
+      expect { response { |r| r.read_body(dest) { |s| } } }.to raise_error(ArgumentError, 'both arg and block given for HTTP method')
     end
 
     it 'raises an IOError when #read_body is called twice with a block' do

data/spec/vcr/library_hooks/fakeweb_spec.rb

@@ -18,16 +18,7 @@ describe "FakeWeb hook", :with_monkey_patches => :fakeweb do
     ::FakeWeb.register_uri(method, url, :body => response_body)
   end
 
-  it_behaves_like 'a hook into an HTTP library', :fakeweb, 'net/http' do
-    before(:each) do
-      VCR::LibraryHooks::FakeWeb::RequestHandler.already_seen_requests.clear
-    end
-
-    after(:each) do
-      # assert that we are cleaning up the global state after every request
-      VCR::LibraryHooks::FakeWeb::RequestHandler.already_seen_requests.to_a.should eq([])
-    end
-  end
+  it_behaves_like 'a hook into an HTTP library', :fakeweb, 'net/http'
 
   describe "some specific Net::HTTP edge cases" do
     before(:each) do
@@ -95,6 +86,24 @@ describe "FakeWeb hook", :with_monkey_patches => :fakeweb do
       ignored_body.should_not eq(recorded_body)
       ignored_body.should match(/Response \d+/)
     end
+
+    context 'when the same Net::HTTP request object is used twice' do
+      let(:uri)  { URI("http://localhost:#{VCR::SinatraApp.port}/foo") }
+      let(:http) { Net::HTTP.new(uri.host, uri.port) }
+
+      it 'raises an UnhandledHTTPRequestError when using a cassette that only recorded one request' do
+        VCR.use_cassette("new_cassette", :record => :once) do
+          request = Net::HTTP::Get.new(uri.request_uri)
+          http.request(request)
+        end
+
+        VCR.use_cassette("new_cassette", :record => :once) do
+          request = Net::HTTP::Get.new(uri.request_uri)
+          http.request(request)
+          http.request(request)
+        end
+      end
+    end
   end
 
   describe "VCR.configuration.after_library_hooks_loaded hook" do

data/spec/vcr/test_frameworks/rspec_spec.rb

@@ -1,10 +1,6 @@
 require 'spec_helper'
 
-RSpec.configure do |config|
-  config.before(:suite) do
-    VCR.configuration.configure_rspec_metadata!
-  end
-end
+VCR.configuration.configure_rspec_metadata!
 
 describe VCR::RSpec::Metadata, :skip_vcr_reset do
   before(:all) { VCR.reset! }

data/vcr.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'cucumber', '~> 1.1.4'
   s.add_development_dependency 'aruba', '~> 0.4.11'
 
-  s.add_development_dependency 'rspec', '~> 2.9.0'
+  s.add_development_dependency 'rspec', '~> 2.11'
   s.add_development_dependency 'shoulda', '~> 2.9.2'
 
   s.add_development_dependency 'fakeweb', '~> 1.3.0'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vcr
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 2
   - 2
-  - 2
-  version: 2.2.2
+  - 3
+  version: 2.2.3
 platform: ruby
 authors: 
 - Myron Marston
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-15 00:00:00 Z
+date: 2012-07-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -87,12 +87,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 21
         segments: 
         - 2
-        - 9
-        - 0
-        version: 2.9.0
+        - 11
+        version: "2.11"
   name: rspec
   type: :development
   prerelease: false