webmock 1.3.3 → 1.3.4

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 #Changelog
 
+## 1.3.4
+
+* Fixed Net::HTTP adapter to handle cases where a block with `read_body` call is passed to `request`.
+  This fixes compatibility with `open-uri`. Thanks to Mark Evans for reporting the issue.
+
 ## 1.3.3
 
 * Fixed handling of multiple values for the same response header for Net::HTTP. Thanks to Myron Marston for reporting the issue.

data/VERSION

@@ -1 +1 @@
-1.3.3
+1.3.4

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -71,8 +71,8 @@ module Net  #:nodoc: all
           webmock_response = build_webmock_response(response)
           WebMock::CallbackRegistry.invoke_callbacks(
             {:lib => :net_http, :real_request => true}, request_signature, webmock_response)
-          response.extend WebMock::Net::HTTPResponse   
         end
+        response.extend WebMock::Net::HTTPResponse
         yield response if block_given?
         response
       else

data/spec/net_http_spec.rb

@@ -59,6 +59,20 @@ describe "Webmock with Net:HTTP" do
       http.request(req, StringIO.new("my_params"))
     }.body.should =~ /Example Web Page/
   end
+  
+  it "should handle requests with block passed to read_body" do
+    body = ""
+    WebMock.allow_net_connect!
+    req = Net::HTTP::Get.new("/")
+    Net::HTTP.start("www.example.com") do |http|
+      http.request(req) do |res|  
+        res.read_body do |str|
+          body << str
+        end 
+      end
+    end
+    body.should =~ /Example Web Page/
+  end
 
   describe 'after_request callback support' do
     let(:expected_body_regex) { /You have reached this web page by typing.*example\.com/ }

data/webmock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webmock}
-  s.version = "1.3.3"
+  s.version = "1.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bartosz Blimke"]
-  s.date = %q{2010-08-03}
+  s.date = %q{2010-08-10}
   s.description = %q{WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.}
   s.email = %q{bartosz.blimke@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 3
-  - 3
-  version: 1.3.3
+  - 4
+  version: 1.3.4
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-03 00:00:00 +01:00
+date: 2010-08-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency