vcr 2.2.3 → 2.2.4

data/CHANGELOG.md

@@ -1,6 +1,15 @@
-## In git
+## 2.2.4 (July 19, 2012)
 
-[Full Changelog](http://github.com/myronmarston/vcr/compare/v2.2.2...master)
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v2.2.3...v2.2.4)
+
+Bug Fixes:
+
+* Fix excon so real requests are made with a connection constructed with
+  same args as the original connection.
+
+## 2.2.3 (July 9, 2012)
+
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v2.2.2...v2.2.3)
 
 Bug Fixes:
 

data/Gemfile

@@ -11,7 +11,7 @@ gem 'yard'
 
 # Additional gems that are useful, but not required for development.
 group :extras do
-  gem 'relish', '~> 0.5.0'
+  gem 'relish', '~> 0.6'
   gem 'fuubar'
   gem 'fuubar-cucumber'
 

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.14').check_version!
+VCR::VersionChecker.new('Excon', Excon::VERSION, '0.9.6', '0.15').check_version!
 
 module VCR
   class LibraryHooks
@@ -58,9 +58,15 @@ module VCR
           end
         end
 
+        def new_connection
+          # Ensure the connection is constructed with the exact same args
+          # that the orginal connection was constructed with.
+          ::Excon::Connection.new(*params.fetch(:__construction_args))
+        end
+
         def perform_real_request
           begin
-            response = ::Excon.new(uri).request(real_request_params)
+            response = new_connection.request(real_request_params)
           rescue ::Excon::Errors::Error => excon_error
             response = response_from_excon_error(excon_error)
           end
@@ -151,7 +157,24 @@ module VCR
   end
 end
 
-Excon.defaults[:mock] = true
+::Excon.defaults[:mock] = true
+
+# We want to get at the Excon::Connection class but WebMock does
+# some constant-replacing stuff to it, so we need to take that into
+# account.
+excon_connection = if defined?(::WebMock::HttpLibAdapters::ExconConnection)
+  ::WebMock::HttpLibAdapters::ExconConnection.superclass
+else
+  ::Excon::Connection
+end
+
+excon_connection.class_eval do
+  def self.new(*args)
+    super.tap do |instance|
+      instance.connection[:__construction_args] = args
+    end
+  end
+end
 
 VCR.configuration.after_library_hooks_loaded do
   # ensure WebMock's Excon adapter does not conflict with us here

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.3'
+      string = '2.2.4'
 
       def string.parts
         split('.').map { |p| p.to_i }

data/spec/vcr/library_hooks/excon_spec.rb

@@ -25,6 +25,44 @@ describe "Excon hook", :with_monkey_patches => :excon do
     end
   end
 
+  context 'when the request overrides the connection params' do
+    let!(:excon) { ::Excon.new("http://localhost:#{VCR::SinatraApp.port}/") }
+
+    def deep_dup(hash)
+      Marshal.load(Marshal.dump hash)
+    end
+
+    def intercept_request(&interception)
+      orig_new = ::Excon::Connection.method(:new)
+
+      ::Excon::Connection.stub(:new) do |*args1|
+        orig_new.call(*args1).tap do |inst|
+
+          meth = inst.method(:request)
+          inst.stub(:request) do |*args2|
+            interception.call(inst, *args2)
+            meth.call(*args2)
+          end
+        end
+      end
+    end
+
+    it 'runs the real request with the same connection params' do
+      connection_params_1 = deep_dup(excon.connection)
+      connection_params_2 = nil
+
+      intercept_request do |instance, *args|
+        connection_params_2 = deep_dup(instance.connection)
+      end
+
+      VCR.use_cassette("excon") do
+        excon.request(:method => :get, :path => '/foo')
+      end
+
+      connection_params_2.should eq(connection_params_1)
+    end
+  end
+
   context "when Excon's streaming API is used" do
     it 'properly records and plays back the response' do
       VCR.stub(:real_http_connections_allowed? => true)
@@ -63,8 +101,7 @@ describe "Excon hook", :with_monkey_patches => :excon do
     it 'performs the right number of retries' do
       connection = Excon.new("http://localhost:#{VCR::SinatraApp.port}/not_found")
 
-      # Excon define's .stub so we can't use RSpec's here...
-      Excon.should_receive(:new).at_least(:once).and_return(connection)
+      Excon::Connection.stub(:new => connection)
 
       connection.extend Module.new {
         def request_kernel_call_counts

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vcr
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: 
   segments: 
   - 2
   - 2
-  - 3
-  version: 2.2.3
+  - 4
+  version: 2.2.4
 platform: ruby
 authors: 
 - Myron Marston
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-10 00:00:00 Z
+date: 2012-07-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement