Added support for Net::HTTP::Post#body_stream (fixed compatibility wi…

…th new versions of RestClient)

lib/webmock/http_lib_adapters/net_http.rb

@@ -72,7 +72,16 @@ def request_with_webmock(request, body = nil, &block)
 
       headers.reject! {|k,v| k =~ /[Aa]uthorization/ && v =~ /^Basic / } #we added it to url userinfo
 
-      request.set_body_internal body
+      if request.body_stream
+        body = request.body_stream.read
+        request.body_stream = nil
+      end
+
+      if body != nil && body.respond_to?(:read)
+        request.set_body_internal body.read
+      else
+        request.set_body_internal body
+      end
 
       request_signature = WebMock::RequestSignature.new(method, uri, :body => request.body, :headers => headers)
 

spec/net_http_spec.rb

@@ -29,6 +29,13 @@
     req.body = "my_params"
     Net::HTTP.start("www.example.com") { |http| http.request(req)}.body.should == "abc"
   end
+
+  it "should handle Net::HTTP::Post#body_stream" do
+    stub_http_request(:post, "www.example.com").with(:body => "my_params").to_return(:body => "abc")
+    req = Net::HTTP::Post.new("/")
+    req.body_stream = StringIO.new("my_params")
+    Net::HTTP.start("www.example.com") { |http| http.request(req)}.body.should == "abc"
+  end
 
   it "should behave like Net::HTTP and raise error if both request body and body argument are set" do
     stub_http_request(:post, "www.example.com").with(:body => "my_params").to_return(:body => "abc")
@@ -39,4 +46,5 @@
     }.should raise_error("both of body argument and HTTPRequest#body set")
   end
 
+
 end