vcr 0.3.0 → 0.3.1

data/History.rdoc

@@ -1,3 +1,6 @@
+== 0.3.1 April 10, 2010
+* Fixed a bug: when Net::HTTP#request was called with a block that had a return statement, the response was not being recorded.
+
 == 0.3.0 March 24, 2010
 * Renamed a bunch of methods, replacing them with method names that more clearly fit the VCR/cassette metaphor:
   * VCR.create_cassette! => VCR.insert_cassette

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/features/record_response.feature

@@ -70,3 +70,8 @@ Feature: Record response
      When I make an HTTP get request to "http://example.com" within the "temp/record_none_cassette" none cassette, allowing requests matching /example.com/
      Then the response for "http://example.com" should match /You have reached this web page by typing.*example\.com/
       And there should not be a "temp/record_none_cassette" library file
+
+  Scenario: Record a request with a block with a return statement
+    Given we do not have a "temp/block_with_a_return" cassette
+     When I make a returning block HTTP get request to "http://example.com" within the "temp/block_with_a_return" new_episodes cassette
+     Then the "temp/block_with_a_return" library file should have a response for "http://example.com" that matches /You have reached this web page by typing.*example\.com/

data/features/step_definitions/vcr_steps.rb

@@ -26,6 +26,12 @@ module VCRHelpers
     end
     @http_requests[url] += [result]
   end
+
+  def perform_get_with_returning_block(uri, path)
+    Net::HTTP.new(uri.host, uri.port).request(Net::HTTP::Get.new(path, {})) do |response|
+      return response
+    end
+  end
 end
 World(VCRHelpers)
 
@@ -88,6 +94,12 @@ When /^I make a recursive HTTP post request to "([^\"]*)"$/ do |url|
   end
 end
 
+When /^I make a returning block HTTP get request to "([^\"]*)"$/ do |url|
+  capture_response(url) do |uri, path|
+    perform_get_with_returning_block(uri, path)
+  end
+end
+
 When /^I make (.*HTTP (?:get|post)) requests? to "([^\"]*)"(?: and "([^\"]*)")? within the "([^\"]*)" ?(#{VCR::Cassette::VALID_RECORD_MODES.join('|')})? cassette(?:, allowing requests matching \/([^\/]+)\/)?$/ do |http_request_type, url1, url2, cassette_name, record_mode, allowed|
   options = { :record => (record_mode ? record_mode.to_sym : :new_episodes) }
   options[:allow_real_http] = lambda { |uri| uri.to_s =~ /#{allowed}/ } if allowed.to_s.size > 0

data/lib/vcr/extensions/net_http.rb

@@ -8,8 +8,9 @@ module Net
       if (cassette = VCR.current_cassette) && cassette.allow_real_http_requests_to?(uri)
         FakeWeb.with_allow_net_connect_set_to(true) { request_without_vcr(request, body, &block) }
       else
-        response = request_without_vcr(request, body, &block)
+        response = request_without_vcr(request, body)
         __store_response_with_vcr__(response, request) if @__request_with_vcr_call_count == 1
+        yield response if block_given?
         response
       end
     ensure

data/spec/extensions/net_http_spec.rb

@@ -17,6 +17,12 @@ describe "Net::HTTP Extensions" do
     end
 
     describe 'a request that is not registered with FakeWeb' do
+      def perform_get_with_returning_block
+        Net::HTTP.new('example.com', 80).request(Net::HTTP::Get.new('/', {})) do |response|
+          return response
+        end
+      end
+
       it 'calls #store_recorded_response! on the current cassette' do
         recorded_response = VCR::RecordedResponse.new(:get, 'http://example.com:80/', :example_response)
         VCR::RecordedResponse.should_receive(:new).with(:get, 'http://example.com:80/', an_instance_of(Net::HTTPOK)).and_return(recorded_response)
@@ -28,6 +34,11 @@ describe "Net::HTTP Extensions" do
         @current_cassette.should_receive(:store_recorded_response!).once
         Net::HTTP.new('example.com', 80).post('/', nil)
       end
+
+      it 'calls #store_recorded_response! when Net::HTTP#request is called with a block with a return statement' do
+        @current_cassette.should_receive(:store_recorded_response!).once
+        perform_get_with_returning_block
+      end
     end
 
     describe 'a request that is registered with FakeWeb' do

data/vcr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vcr}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Myron Marston"]
-  s.date = %q{2010-03-24}
+  s.date = %q{2010-04-10}
   s.description = %q{VCR provides helpers to record HTTP requests for URIs that are not registered with fakeweb, and replay them later.  It works with any ruby testing framework, and provides built-in support for cucumber.}
   s.email = %q{myron.marston@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Myron Marston
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-24 00:00:00 -07:00
+date: 2010-04-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency