webmock 1.12.2 → 1.12.3

data/.travis.yml

@@ -13,5 +13,3 @@ matrix:
     - rvm: rbx-18mode
     - rvm: rbx-19mode
     - rvm: jruby-18mode
-
-script: "bundle exec rake && rake em_http_request_0_x_spec"

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.12.3
+
+* Fixed issue with handling Addressable::URI with query params passed to `Net::HTTP.get_response`
+
+  Thanks to [Leif Bladt](https://github.com/leifbladt)
+
+* Fixed HTTPClient adapter to not raise an error if a request with multipart body is executed.
+
 ## 1.12.2
 
 * Fixed issue with handling request.path when Addressable::URI is passed to #request instead of URI with Ruby 2.0.

data/README.md

@@ -1,4 +1,4 @@
-WebMock [![Build Status](https://secure.travis-ci.org/bblimke/webmock.png?branch=master)](http://travis-ci.org/bblimke/webmock) [![Dependency Status](https://gemnasium.com/bblimke/webmock.png)](http://gemnasium.com/bblimke/webmock)
+WebMock [![Build Status](https://secure.travis-ci.org/bblimke/webmock.png?branch=master)](http://travis-ci.org/bblimke/webmock) [![Dependency Status](https://gemnasium.com/bblimke/webmock.png)](http://gemnasium.com/bblimke/webmock) [![Stories in Ready](http://badge.waffle.io/bblimke/webmock.png)](http://waffle.io/bblimke/webmock)
 =======
 
 Library for stubbing and setting expectations on HTTP requests in Ruby.

data/lib/webmock/http_lib_adapters/httpclient_adapter.rb

@@ -159,7 +159,7 @@ if defined?(::HTTPClient)
     signature = WebMock::RequestSignature.new(
       req.header.request_method.downcase.to_sym,
       uri.to_s,
-      :body => req.content,
+      :body => req.http_body.dump,
       :headers => headers
     )
 

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -236,8 +236,8 @@ module WebMock
 
       path = request.path
 
-      if path.respond_to?(:path) #https://github.com/bblimke/webmock/issues/288
-        path = path.path
+      if path.respond_to?(:request_uri) #https://github.com/bblimke/webmock/issues/288
+        path = path.request_uri
       end
 
       path = WebMock::Util::URI.heuristic_parse(path).request_uri if path =~ /^http/

data/lib/webmock/version.rb

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

data/spec/acceptance/httpclient/httpclient_spec.rb

@@ -8,6 +8,7 @@ describe "HTTPClient" do
   include HTTPClientSpecHelper
 
   before(:each) do
+    WebMock.reset_callbacks
     HTTPClientSpecHelper.async_mode = false
   end
 
@@ -46,6 +47,32 @@ describe "HTTPClient" do
     str.should == 'test'
   end
 
+  context "multipart bodies" do
+    let(:header) {{
+        'Accept' => 'application/json',
+        'Content-Type' => 'multipart/form-data'
+    }}
+
+   let(:body) {[
+      {
+        'Content-Type' => 'application/json',
+        'Content-Disposition' => 'form-data',
+        :content => '{"foo": "bar", "baz": 2}'
+      }
+    ]}
+
+    let(:make_request) {HTTPClient.new.post("http://www.example.com", body: body, header: header)}
+
+    before do
+      stub_request(:post, "www.example.com")
+    end
+
+    it "should work with multipart bodies" do
+      make_request
+    end
+  end
+
+
   context "Filters" do
     class Filter
       def filter_request(request)

data/spec/acceptance/net_http/net_http_spec.rb

@@ -159,8 +159,8 @@ describe "Net:HTTP" do
   end
 
   it "should work with Addressable::URI passed to Net::HTTP.get_response" do
-    stub_request(:get, 'http://www.example.com')
-    Net::HTTP.get_response(Addressable::URI.parse('http://www.example.com/'))
+    stub_request(:get, 'http://www.example.com/hello?a=1').to_return(:body => "abc")
+    Net::HTTP.get_response(Addressable::URI.parse('http://www.example.com/hello?a=1')).body.should == "abc"
   end
 
   describe "connecting on Net::HTTP.start" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 33
   prerelease: 
   segments: 
   - 1
   - 12
-  - 2
-  version: 1.12.2
+  - 3
+  version: 1.12.3
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-27 00:00:00 Z
+date: 2013-06-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable