webmock 1.17.1 → 1.17.2

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.17.2
+
+* Support for chunked responses in Curb
+
+  Thanks to [Zachary Belzer](https://github.com/zbelzer)
+
+* Fixed handling of request body passed as a hash to `Typhoeus.post`
+
+  Thanks to [Mason Chang](https://github.com/changmason) for reporting.
+
 ## 1.17.1
 
 * Added missing license statements.

data/lib/webmock/http_lib_adapters/curb_adapter.rb

@@ -125,6 +125,7 @@ if defined?(Curl)
           end
 
           @content_type = webmock_response.headers["Content-Type"]
+          @transfer_encoding = webmock_response.headers["Transfer-Encoding"]
         end
 
         @last_effective_url ||= self.url
@@ -144,7 +145,15 @@ if defined?(Curl)
       def invoke_curb_callbacks
         @on_progress.call(0.0,1.0,0.0,1.0) if @on_progress
         self.header_str.lines.each { |header_line| @on_header.call header_line } if @on_header
-        @on_body.call(self.body_str) if @on_body
+        if @on_body
+          if chunked_response?
+            self.body_str.each do |chunk|
+              @on_body.call(chunk)
+            end
+          else
+            @on_body.call(self.body_str)
+          end
+        end
         @on_complete.call(self) if @on_complete
 
         case response_code
@@ -155,6 +164,10 @@ if defined?(Curl)
         end
       end
 
+      def chunked_response?
+        @transfer_encoding == 'chunked' && self.body_str.respond_to?(:each)
+      end
+
       def build_webmock_response
         status, headers =
          WebMock::HttpLibAdapters::CurbAdapter.parse_header_string(self.header_str)

data/lib/webmock/http_lib_adapters/http_gem_adapter.rb

@@ -46,7 +46,7 @@ if defined?(HTTP::Client)
         webmock_response = ::WebMock::Response.new
 
         webmock_response.status  = [status, reason]
-        webmock_response.body    = body
+        webmock_response.body    = body.to_s
         webmock_response.headers = headers
 
         webmock_response

data/lib/webmock/http_lib_adapters/typhoeus_hydra_adapter.rb

@@ -59,6 +59,10 @@ if defined?(Typhoeus)
 
           body = req.options[:body]
 
+          if body.is_a?(Hash)
+            body = WebMock::Util::QueryMapper.values_to_query(body)
+          end
+
           request_signature = WebMock::RequestSignature.new(
             req.options[:method] || :get,
             uri.to_s,

data/lib/webmock/version.rb

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

data/spec/acceptance/curb/curb_spec.rb

@@ -81,6 +81,20 @@ unless RUBY_PLATFORM =~ /java/
         test.should == body
       end
 
+      it "should call on_body for each chunk with chunked response" do
+        body = "on_body fired"
+        stub_request(:any, "example.com").
+          to_return(:body => ["first_chunk", "second_chunk"],
+                    :headers => {"Transfer-Encoding" => "chunked"})
+
+        test = []
+        @curl.on_body do |data|
+          test << data
+        end
+        @curl.http_get
+        test.should == ["first_chunk", "second_chunk"]
+      end
+
       it "should call on_header when response headers are read" do
         stub_request(:any, "example.com").
           to_return(:headers => {:one => 1})
@@ -267,6 +281,41 @@ unless RUBY_PLATFORM =~ /java/
         end
       end
     end
+
+    describe "#chunked_response?" do
+      before(:each) do
+        @curl = Curl::Easy.new
+        @curl.url = "http://example.com"
+      end
+
+      it "is true when Transfer-Encoding is 'chunked' and body responds to each" do
+        stub_request(:any, 'example.com').
+          to_return(:body     => ["abc", "def"],
+                    :status   => 200,
+                    :headers  => { 'Transfer-Encoding' => 'chunked' })
+
+        @curl.http_get
+        @curl.should be_chunked_response
+      end
+
+      it "is false when Transfer-Encoding is not 'chunked'" do
+        stub_request(:any, 'example.com').
+          to_return(:body     => ["abc", "def"],
+                    :status   => 200)
+
+        @curl.http_get
+        @curl.should_not be_chunked_response
+      end
+
+      it "is false when Transfer-Encoding is 'chunked' but body does not respond to each" do
+        stub_request(:any, 'example.com').
+          to_return(:body     => "abc",
+                    :status   => 200)
+
+        @curl.http_get
+        @curl.should_not be_chunked_response
+      end
+    end
   end
 
   describe "Webmock with Curb" do

data/spec/acceptance/shared/callbacks.rb

@@ -101,20 +101,20 @@ shared_context "callbacks" do |*adapter_info|
           WebMock.after_request(:except => [:other_lib])  do |_, response|
             @response = response
           end
-          http_request(:get, "http://httpstat.us/200")
+          http_request(:get, "http://httpstat.us/201")
         end
 
         it "should pass real response to callback with status and message" do
-          @response.status[0].should == 200
-          @response.status[1].should == "OK" unless adapter_info.include?(:no_status_message)
+          @response.status[0].should == 201
+          @response.status[1].should == "Created" unless adapter_info.include?(:no_status_message)
         end
 
         it "should pass real response to callback with headers" do
-          @response.headers["Content-Length"].should == "6"
+          @response.headers["Content-Length"].should == "11"
         end
 
         it "should pass response to callback with body" do
-          @response.body.size.should == 6
+          @response.body.size.should == 11
         end
       end
     end

data/spec/acceptance/typhoeus/typhoeus_hydra_spec.rb

@@ -28,6 +28,12 @@ unless RUBY_PLATFORM =~ /java/
           hydra.run
         end
 
+        it "should take into account body for POST request" do
+          stub_request(:post, "www.example.com").with(:body => {:hello => 'world'})
+          response = Typhoeus.post("http://www.example.com", :method => :post, :body => {:hello => 'world'})
+          expect(response.code).to eq(200)
+        end
+
         it "should take into account params for GET request" do
           stub_request(:get, "http://www.example.com/?hello=world").to_return({})
           request = Typhoeus::Request.new("http://www.example.com/?hello=world", :method => :get)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 87
   prerelease: 
   segments: 
   - 1
   - 17
-  - 1
-  version: 1.17.1
+  - 2
+  version: 1.17.2
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-01-17 00:00:00 +01:00
+date: 2014-02-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency