vcr 0.4.1 → 1.0.0

data/lib/vcr/extensions/net_http.rb

@@ -5,32 +5,25 @@ module Net
     def request_with_vcr(request, body = nil, &block)
       uri = URI.parse(VCR.http_stubbing_adapter.request_uri(self, request))
 
-      if (cassette = VCR.current_cassette) && cassette.allow_real_http_requests_to?(uri)
+      if VCR::LOCALHOST_ALIASES.include?(uri.host) && VCR.http_stubbing_adapter.ignore_localhost?
         VCR.http_stubbing_adapter.with_http_connections_allowed_set_to(true) do
-          request_without_vcr(request, body, &block)
+          return request_without_vcr(request, body, &block)
         end
-      else
-        response = request_without_vcr(request, body)
-        __store_response_with_vcr__(response, request) if started?
-        yield response if block_given?
-        response
       end
-    end
-    alias_method :request_without_vcr, :request
-    alias_method :request, :request_with_vcr
 
-    private
+      response = request_without_vcr(request, body)
 
-    def __store_response_with_vcr__(response, request)
-      if cassette = VCR.current_cassette
-        uri = VCR.http_stubbing_adapter.request_uri(self, request)
-        method = request.method.downcase.to_sym
+      if started? && !VCR.http_stubbing_adapter.request_stubbed?(request.method.downcase.to_sym, uri)
+        http_interaction = VCR::HTTPInteraction.from_net_http_objects(self, request, response)
+        response.extend VCR::Net::HTTPResponse # "unwind" the response
 
-        unless VCR.http_stubbing_adapter.request_stubbed?(method, uri)
-          cassette.record_http_interaction(VCR::HTTPInteraction.from_net_http_objects(self, request, response))
-          response.extend VCR::Net::HTTPResponse
-        end
+        VCR.record_http_interaction(http_interaction)
       end
+
+      yield response if block_given?
+      response
     end
+    alias_method :request_without_vcr, :request
+    alias_method :request, :request_with_vcr
   end
-end
+end

data/lib/vcr/extensions/net_http_response.rb

@@ -13,35 +13,28 @@ module VCR
   module Net
     module HTTPResponse
       def self.extended(object)
-        body_object = object.instance_variable_get(:@body)
-        object.instance_variable_set(:@__orig_body__,
-          case body_object
-            when String then body_object
-            when ::Net::ReadAdapter then body_object.instance_variable_get(:@__body_for_vcr__)
-            else raise ArgumentError.new("Unexpected body object: #{body_object}")
-          end
-        )
+        object.instance_variable_set(:@__orig_body_for_vcr__, object.instance_variable_get(:@body))
       end
 
       def read_body(dest = nil, &block)
-        if @__orig_body__
+        if @__orig_body_for_vcr__
           if dest && block
             raise ArgumentError.new("both arg and block given for HTTP method")
           elsif dest
-            dest << @__orig_body__
+            dest << @__orig_body_for_vcr__
           elsif block
             @body = ::Net::ReadAdapter.new(block)
-            @body << @__orig_body__
+            @body << @__orig_body_for_vcr__
             @body
           else
-            @body = @__orig_body__
+            @body = @__orig_body_for_vcr__
           end
         else
           super
         end
       ensure
         # allow subsequent calls to #read_body to proceed as normal, without our hack...
-        @__orig_body__ = nil
+        @__orig_body_for_vcr__ = nil
       end
     end
   end

data/lib/vcr/http_stubbing_adapters/fakeweb.rb

@@ -1,4 +1,4 @@
-require 'vcr/extensions/fake_web'
+require 'fakeweb'
 require 'vcr/extensions/net_http'
 
 module VCR
@@ -44,7 +44,25 @@ module VCR
         end
 
         def request_uri(net_http, request)
-          ::FakeWeb.request_uri(net_http, request)
+          # Copied from: http://github.com/chrisk/fakeweb/blob/fakeweb-1.2.8/lib/fake_web/ext/net_http.rb#L39-52
+          protocol = net_http.use_ssl? ? "https" : "http"
+
+          path = request.path
+          path = URI.parse(request.path).request_uri if request.path =~ /^http/
+
+          if request["authorization"] =~ /^Basic /
+            userinfo = FakeWeb::Utility.decode_userinfo_from_header(request["authorization"])
+            userinfo = FakeWeb::Utility.encode_unsafe_chars_in_userinfo(userinfo) + "@"
+          else
+            userinfo = ""
+          end
+
+          "#{protocol}://#{userinfo}#{net_http.address}:#{net_http.port}#{path}"
+        end
+
+        attr_writer :ignore_localhost
+        def ignore_localhost?
+          @ignore_localhost
         end
 
         private
@@ -68,7 +86,7 @@ if defined?(FakeWeb::NetConnectNotAllowedError)
   module FakeWeb
     class NetConnectNotAllowedError
       def message
-        super + '.  You can use VCR to automatically record this request and replay it later.  For more details, see the VCR README at: http://github.com/myronmarston/vcr'
+        super + ".  You can use VCR to automatically record this request and replay it later.  For more details, see the VCR README at: http://github.com/myronmarston/vcr/tree/v#{VCR.version}"
       end
     end
   end

data/lib/vcr/http_stubbing_adapters/webmock.rb

@@ -5,7 +5,7 @@ module VCR
   module HttpStubbingAdapters
     class WebMock < Base
       class << self
-        VERSION_REQUIREMENT = '1.1.0'
+        VERSION_REQUIREMENT = '1.3.0'
 
         def check_version!
           unless meets_version_requirement?(::WebMock.version, VERSION_REQUIREMENT)
@@ -44,13 +44,21 @@ module VCR
         end
 
         def request_stubbed?(method, uri)
-          !!::WebMock.registered_request?(::WebMock::RequestSignature.new(method, uri))
+          !!::WebMock.registered_request?(::WebMock::RequestSignature.new(method, uri.to_s))
         end
 
         def request_uri(net_http, request)
           ::WebMock::NetHTTPUtility.request_signature_from_request(net_http, request).uri.to_s
         end
 
+        def ignore_localhost=(value)
+          ::WebMock::Config.instance.allow_localhost = value
+        end
+
+        def ignore_localhost?
+          ::WebMock::Config.instance.allow_localhost
+        end
+
         private
 
         def response_hash(response)
@@ -69,12 +77,34 @@ module VCR
   end
 end
 
+WebMock.after_request(:except => [:net_http], :real_requests_only => true) do |request, response|
+  http_interaction = VCR::HTTPInteraction.new(
+    VCR::Request.new(
+      request.method,
+      request.uri.to_s,
+      request.body,
+      request.headers
+    ),
+    VCR::Response.new(
+      VCR::ResponseStatus.new(
+        response.status.first,
+        response.status.last
+      ),
+      response.headers,
+      response.body,
+      '1.1'
+    )
+  )
+
+  VCR.record_http_interaction(http_interaction)
+end
+
 if defined?(WebMock::NetConnectNotAllowedError)
   module WebMock
     class NetConnectNotAllowedError
       def message
-        super + '.  You can use VCR to automatically record this request and replay it later.  For more details, see the VCR README at: http://github.com/myronmarston/vcr'
+        super + ".  You can use VCR to automatically record this request and replay it later.  For more details, see the VCR README at: http://github.com/myronmarston/vcr/tree/v#{VCR.version}"
       end
     end
   end
-end
+end

data/lib/vcr/version.rb

@@ -0,0 +1,16 @@
+module VCR
+  extend self
+
+  def version
+    @version ||= begin
+      string = [1, 0, 0].join('.')
+
+      def string.parts; VCR.version.split('.').map { |p| p.to_i }; end
+      def string.major; parts[0]; end
+      def string.minor; parts[1]; end
+      def string.patch; parts[2]; end
+
+      string
+    end
+  end
+end

metadata

@@ -3,10 +3,10 @@ name: vcr
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 0
-  - 4
   - 1
-  version: 0.4.1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Myron Marston
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-11 00:00:00 -07:00
+date: 2010-06-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,13 +22,13 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 2
-        - 9
-        version: 1.2.9
+        - 3
+        - 0
+        version: 1.3.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,8 +41,8 @@ dependencies:
         segments: 
         - 0
         - 6
-        - 1
-        version: 0.6.1
+        - 4
+        version: 0.6.4
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
@@ -64,111 +64,105 @@ dependencies:
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 1
+        - 3
         - 0
-        version: 1.1.0
+        version: 1.3.0
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: httpclient
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 5
+        - 2
+        version: 2.1.5.2
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: patron
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 6
+        version: 0.4.6
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: em-http-request
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 7
+        version: 0.2.7
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: capybara
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 8
+        version: 0.3.8
+  type: :development
+  version_requirements: *id008
 description: VCR provides helpers to record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests.  It works with any ruby testing framework, and provides built-in support for cucumber.
 email: myron.marston@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.md
+extra_rdoc_files: []
+
 files: 
-- .document
-- .gitignore
-- CHANGELOG.md
-- LICENSE
-- README.md
-- Rakefile
-- VERSION
-- benchmarks/http_stubbing_libraries.rb
-- features/fixtures/vcr_cassettes/1.8.6/cucumber_tags/replay_cassette1.yml
-- features/fixtures/vcr_cassettes/1.8.6/cucumber_tags/replay_cassette2.yml
-- features/fixtures/vcr_cassettes/1.8.6/cucumber_tags/replay_cassette3.yml
-- features/fixtures/vcr_cassettes/1.8.6/nested_replay_cassette.yml
-- features/fixtures/vcr_cassettes/1.8.6/not_the_real_response.yml
-- features/fixtures/vcr_cassettes/1.8.7/cucumber_tags/replay_cassette1.yml
-- features/fixtures/vcr_cassettes/1.8.7/cucumber_tags/replay_cassette2.yml
-- features/fixtures/vcr_cassettes/1.8.7/cucumber_tags/replay_cassette3.yml
-- features/fixtures/vcr_cassettes/1.8.7/nested_replay_cassette.yml
-- features/fixtures/vcr_cassettes/1.8.7/not_the_real_response.yml
-- features/fixtures/vcr_cassettes/1.9.1/cucumber_tags/replay_cassette1.yml
-- features/fixtures/vcr_cassettes/1.9.1/cucumber_tags/replay_cassette2.yml
-- features/fixtures/vcr_cassettes/1.9.1/cucumber_tags/replay_cassette3.yml
-- features/fixtures/vcr_cassettes/1.9.1/nested_replay_cassette.yml
-- features/fixtures/vcr_cassettes/1.9.1/not_the_real_response.yml
-- features/record_response.feature
-- features/replay_recorded_response.feature
-- features/step_definitions/vcr_steps.rb
-- features/support/env.rb
-- lib/vcr.rb
 - lib/vcr/cassette.rb
 - lib/vcr/config.rb
 - lib/vcr/cucumber_tags.rb
 - lib/vcr/deprecations.rb
-- lib/vcr/extensions/fake_web.rb
 - lib/vcr/extensions/net_http.rb
 - lib/vcr/extensions/net_http_response.rb
-- lib/vcr/extensions/net_read_adapter.rb
 - lib/vcr/http_stubbing_adapters/base.rb
 - lib/vcr/http_stubbing_adapters/fakeweb.rb
 - lib/vcr/http_stubbing_adapters/webmock.rb
 - lib/vcr/structs.rb
 - lib/vcr/task_runner.rb
 - lib/vcr/tasks/vcr.rake
-- spec/cassette_spec.rb
-- spec/config_spec.rb
-- spec/cucumber_tags_spec.rb
-- spec/deprecations_spec.rb
-- spec/extensions/net_http_response_spec.rb
-- spec/extensions/net_http_spec.rb
-- spec/extensions/net_read_adapter_spec.rb
-- spec/fixtures/1.8.6/0_3_1_cassette.yml
-- spec/fixtures/1.8.6/cassette_spec/example.yml
-- spec/fixtures/1.8.6/example_net_http.yml
-- spec/fixtures/1.8.6/example_net_http_request.yml
-- spec/fixtures/1.8.6/example_net_http_response.yml
-- spec/fixtures/1.8.6/fake_example.com_responses.yml
-- spec/fixtures/1.8.7/0_3_1_cassette.yml
-- spec/fixtures/1.8.7/cassette_spec/example.yml
-- spec/fixtures/1.8.7/example_net_http.yml
-- spec/fixtures/1.8.7/example_net_http_request.yml
-- spec/fixtures/1.8.7/example_net_http_response.yml
-- spec/fixtures/1.8.7/fake_example.com_responses.yml
-- spec/fixtures/1.9.1/0_3_1_cassette.yml
-- spec/fixtures/1.9.1/cassette_spec/example.yml
-- spec/fixtures/1.9.1/example_net_http.yml
-- spec/fixtures/1.9.1/example_net_http_request.yml
-- spec/fixtures/1.9.1/example_net_http_response.yml
-- spec/fixtures/1.9.1/fake_example.com_responses.yml
-- spec/http_stubbing_adapters/fakeweb_spec.rb
-- spec/http_stubbing_adapters/webmock_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/structs_spec.rb
-- spec/support/deprecated.rb
-- spec/support/disable_warnings.rb
-- spec/support/http_stubbing_adapter.rb
-- spec/support/temp_cassette_library_dir.rb
-- spec/task_runner_spec.rb
-- spec/vcr_spec.rb
-- vcr.gemspec
+- lib/vcr/version.rb
+- lib/vcr.rb
+- LICENSE
+- README.md
+- CHANGELOG.md
 has_rdoc: true
 homepage: http://github.com/myronmarston/vcr
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -176,15 +170,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      - 6
+      version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 5
+      version: 1.3.5
 requirements: []
 
 rubyforge_project: 
@@ -192,21 +190,5 @@ rubygems_version: 1.3.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.
-test_files: 
-- spec/cassette_spec.rb
-- spec/config_spec.rb
-- spec/cucumber_tags_spec.rb
-- spec/deprecations_spec.rb
-- spec/extensions/net_http_response_spec.rb
-- spec/extensions/net_http_spec.rb
-- spec/extensions/net_read_adapter_spec.rb
-- spec/http_stubbing_adapters/fakeweb_spec.rb
-- spec/http_stubbing_adapters/webmock_spec.rb
-- spec/spec_helper.rb
-- spec/structs_spec.rb
-- spec/support/deprecated.rb
-- spec/support/disable_warnings.rb
-- spec/support/http_stubbing_adapter.rb
-- spec/support/temp_cassette_library_dir.rb
-- spec/task_runner_spec.rb
-- spec/vcr_spec.rb
+test_files: []
+