webmock 1.9.1 → 1.9.2

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.9.2
+
+* Added support for Excon's :response_block parameter
+
+  Thanks to [Myron Marston](https://github.com/myronmarston) for reporting this issue.
+
 ## 1.9.1
 
 * Fix 'rack.errors' not being set for Rack apps

data/lib/webmock/http_lib_adapters/excon_adapter.rb

@@ -64,11 +64,11 @@ if defined?(Excon)
             :headers => mock.headers
         end
 
-        def self.mock_response(real)
+        def self.mock_response(real, response_body_from_chunks)
           mock = WebMock::Response.new
           mock.status  = real.status
           mock.headers = real.headers
-          mock.body    = real.body
+          mock.body    = response_body_from_chunks || real.body
           mock
         end
 
@@ -81,7 +81,7 @@ if defined?(Excon)
 
       class ExconConnection < ::Excon::Connection
 
-        def request_kernel(params, &block)
+        def request_kernel(params)
           mock_request  = ExconAdapter.build_request params.dup
           WebMock::RequestRegistry.instance.requested_signatures.put(mock_request)
 
@@ -91,13 +91,31 @@ if defined?(Excon)
 
             if params.has_key?(:expects) && ![*params[:expects]].include?(response.status)
               raise(Excon::Errors.status_error(params, response))
-            else
-              response
+            elsif params.has_key?(:response_block)
+              content_length = remaining = response.body.bytesize
+              body = response.body
+              response.body = ""
+              i = 0
+              while i < body.length
+                params[:response_block].call(body[i, params[:chunk_size]], [remaining - params[:chunk_size], 0].max, content_length)
+                remaining -= params[:chunk_size]
+                i += params[:chunk_size]
+              end
             end
+            response
 
           elsif WebMock.net_connect_allowed?(mock_request.uri)
+            response_body_from_chunks = nil
+            if params.has_key?(:response_block)
+              response_body_from_chunks = ""
+              original_block = params[:response_block]
+              params[:response_block] = lambda {|chunk, remaining, total|
+                response_body_from_chunks << chunk
+                original_block.call(chunk, remaining, total)
+              }
+            end
             real_response = super
-            ExconAdapter.perform_callbacks(mock_request, ExconAdapter.mock_response(real_response), :real_request => true)
+            ExconAdapter.perform_callbacks(mock_request, ExconAdapter.mock_response(real_response, response_body_from_chunks), :real_request => true)
             real_response
           else
             raise WebMock::NetConnectNotAllowedError.new(mock_request)

data/lib/webmock/version.rb

@@ -1,3 +1,3 @@
 module WebMock
-  VERSION = '1.9.1' unless defined?(::WebMock::VERSION)
+  VERSION = '1.9.2' unless defined?(::WebMock::VERSION)
 end

data/spec/acceptance/excon/excon_spec.rb

@@ -16,6 +16,37 @@ describe "Excon" do
     lambda { Excon.get('http://example.com', :expects => 204) }.should raise_error(Excon::Errors::OK)
   end
 
+  context "with response_block" do
+    it "should support excon response_block for real requests" do
+      a = []
+      WebMock.allow_net_connect!
+      r = Excon.get('http://httpstat.us/200', :response_block => lambda {|e,remaining, total| a << e}, :chunk_size => 1)
+      a.should == ["2", "0", "0", " ", "O", "K"]
+      r.body.should == ""
+    end
+
+    it "should support excon response_block" do
+      a = []
+      stub_request(:get, "http://example.com/").to_return(:body => "abc")
+      r = Excon.get('http://example.com', :response_block => lambda {|e, remaining, total| a << e}, :chunk_size => 1)
+      a.should == ['a', 'b', 'c']
+      r.body.should == ""
+    end
+
+    it "should invoke callbacks with response body even if a real request is made" do
+      a = []
+      WebMock.allow_net_connect!
+      response = nil
+      WebMock.after_request { |_, res|
+        response = res
+      }
+      r = Excon.get('http://httpstat.us/200', :response_block => lambda {|e,remaining, total| a << e}, :chunk_size => 1)
+      response.body.should == "200 OK"
+      a.should == ["2", "0", "0", " ", "O", "K"]
+      r.body.should == ""
+    end
+  end
+
   let(:file) { File.new(__FILE__) }
   let(:file_contents) { File.new(__FILE__).read }
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 1
   - 9
-  - 1
-  version: 1.9.1
+  - 2
+  version: 1.9.2
 platform: ruby
 authors: 
 - Bartosz Blimke