webmock 1.12.1 → 1.12.2

data/CHANGELOG.md

@@ -1,10 +1,23 @@
 # Changelog
 
+## 1.12.2
+
+* Fixed issue with handling request.path when Addressable::URI is passed to #request instead of URI with Ruby 2.0.
+
+  Thanks to [Leif Bladt](https://github.com/leifbladt)
+
+* Accept integers as query param values in request stubs
+
+  i.e. `stub_request(:get, /.*/).with(:query => {"a" => 1})`
+
+  Thanks to [Mitsutaka Mimura](https://github.com/takkanm)
 
 ## 1.12.1
 
 * Fixed Minitest < 5.0 compatibility
 
+  Thanks to [Alex Tomlins](https://github.com/alext) for reporting the issue.
+
 ## 1.12.0
 
 * Not using Gem spec anymore to check loaded Curb version.

data/README.md

@@ -847,6 +847,9 @@ People who submitted patches and new features or suggested improvements. Many th
 * Tim Kurvers
 * Ilya Vassilevsky
 * gotwalt
+* Leif Bladt
+* Alex Tomlins
+* Mitsutaka Mimura
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -235,7 +235,12 @@ module WebMock
       protocol = net_http.use_ssl? ? "https" : "http"
 
       path = request.path
-      path = WebMock::Util::URI.heuristic_parse(request.path).request_uri if request.path =~ /^http/
+
+      if path.respond_to?(:path) #https://github.com/bblimke/webmock/issues/288
+        path = path.path
+      end
+
+      path = WebMock::Util::URI.heuristic_parse(path).request_uri if path =~ /^http/
 
       if request["authorization"] =~ /^Basic /
         userinfo = WebMock::Util::Headers.decode_userinfo_from_header(request["authorization"])

data/lib/webmock/util/query_mapper.rb

@@ -169,7 +169,7 @@ module WebMock::Util
           return parent
         else
           encoded_value = Addressable::URI.encode_component(
-            value.dup, Addressable::URI::CharacterClasses::UNRESERVED
+            value.to_s.dup, Addressable::URI::CharacterClasses::UNRESERVED
           )
           return "#{parent}=#{encoded_value}"
         end

data/lib/webmock/version.rb

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

data/spec/acceptance/net_http/net_http_spec.rb

@@ -158,6 +158,11 @@ describe "Net:HTTP" do
     WebMock::RequestRegistry.instance.requested_signatures.hash.values.first.should == 1
   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/'))
+  end
+
   describe "connecting on Net::HTTP.start" do
     before(:each) do
       @http = Net::HTTP.new('www.google.com', 443)

data/spec/acceptance/shared/stubbing_requests.rb

@@ -6,6 +6,11 @@ shared_examples_for "stubbing requests" do |*adapter_info|
         http_request(:get, "http://www.example.com/hello%2B/?#{ESCAPED_PARAMS}").body.should == "abc"
       end
 
+      it "should return stubbed response even if query params have integer values" do
+        stub_request(:get, "www.example.com").with(:query => {"a" => 1}).to_return(:body => "abc")
+        http_request(:get, "http://www.example.com/?a=1").body.should == "abc"
+      end
+
       it "should return stubbed response even if request has non escaped params" do
         stub_request(:get, "www.example.com/hello%2B/?#{ESCAPED_PARAMS}").to_return(:body => "abc")
         http_request(:get, "http://www.example.com/hello+/?#{NOT_ESCAPED_PARAMS}").body.should == "abc"

metadata

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