webmock 1.10.1 → 1.10.2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.10.2
+
+* '+' in request path is treated as plus, but in query params always as a space.
+
 ## 1.10.1
 
 * '+' in request body is still treated as a space. This fixes a bug introduced in previous version.

data/lib/webmock/http_lib_adapters/excon_adapter.rb

@@ -31,7 +31,7 @@ if defined?(Excon)
               string << key.to_s << '&'
             else
               for value in [*values]
-                string << key.to_s << '=' << URI.escape(value.to_s) << '&'
+                string << key.to_s << '=' << CGI.escape(value.to_s) << '&'
               end
             end
           end

data/lib/webmock/request_pattern.rb

@@ -201,7 +201,7 @@ module WebMock
       when :xml then
         Crack::XML.parse(body)
       else
-        WebMock::Util::QueryMapper.query_to_values(body, :form_url_encoded => true)
+        WebMock::Util::QueryMapper.query_to_values(body)
       end
     end
 

data/lib/webmock/request_stub.rb

@@ -81,7 +81,7 @@ module WebMock
 
       if signature.body.to_s != ''
         body = if signature.url_encoded?
-          WebMock::Util::QueryMapper.query_to_values(signature.body, :form_url_encoded => true)
+          WebMock::Util::QueryMapper.query_to_values(signature.body)
         else
           signature.body
         end

data/lib/webmock/util/query_mapper.rb

@@ -66,8 +66,7 @@ module WebMock::Util
                 value = true if value.nil?
                 key = Addressable::URI.unencode_component(key)
                 if value != true
-                  value.gsub!(/\+/, " ") if options[:form_url_encoded]
-                  value = Addressable::URI.unencode_component(value)
+                  value = Addressable::URI.unencode_component(value.gsub(/\+/, " "))
                 end
                 if options[:notation] == :flat
                   if accumulator[key]

data/lib/webmock/version.rb

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

data/minitest/webmock_spec.rb

@@ -56,6 +56,5 @@ require File.expand_path(File.dirname(__FILE__) + '/test_helper')
        assert_requested(@stub_http)
      end
     end
-
   end
 

data/spec/acceptance/shared/stubbing_requests.rb

@@ -2,13 +2,13 @@ shared_examples_for "stubbing requests" do |*adapter_info|
   describe "when requests are stubbed" do
     describe "based on uri" do
       it "should return stubbed response even if request have escaped parameters" do
-        stub_request(:get, "www.example.com/hello/?#{NOT_ESCAPED_PARAMS}").to_return(:body => "abc")
-        http_request(:get, "http://www.example.com/hello/?#{ESCAPED_PARAMS}").body.should == "abc"
+        stub_request(:get, "www.example.com/hello+/?#{NOT_ESCAPED_PARAMS}").to_return(:body => "abc")
+        http_request(:get, "http://www.example.com/hello%2B/?#{ESCAPED_PARAMS}").body.should == "abc"
       end
 
       it "should return stubbed response even if request has non escaped params" do
-        stub_request(:get, "www.example.com/hello/?#{ESCAPED_PARAMS}").to_return(:body => "abc")
-        http_request(:get, "http://www.example.com/hello/?#{NOT_ESCAPED_PARAMS}").body.should == "abc"
+        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"
       end
 
       it "should return stubbed response even if stub uri is declared as regexp and request params are escaped" do
@@ -18,18 +18,21 @@ shared_examples_for "stubbing requests" do |*adapter_info|
 
       it "should raise error specifying stubbing instructions with escaped characters in params if there is no matching stub" do
         begin
-          http_request(:get, "http://www.example.com/hello/?#{NOT_ESCAPED_PARAMS}")
+          http_request(:get, "http://www.example.com/hello+/?#{NOT_ESCAPED_PARAMS}")
         rescue WebMock::NetConnectNotAllowedError => e
-          e.message.should match /Unregistered request: GET http:\/\/www\.example\.com\/hello\/\?x=ab%20c&z='Stop!'%20said%20Fred%2Bm/m
-          e.message.should match /stub_request\(:get, "http:\/\/www\.example\.com\/hello\/\?x=ab%20c&z='Stop!'%20said%20Fred%2Bm"\)/m
+          e.message.should match /Unregistered request: GET http:\/\/www\.example\.com\/hello\+\/\?x=ab%20c&z='Stop!'%20said%20Fred%20m/m
+          e.message.should match /stub_request\(:get, "http:\/\/www\.example\.com\/hello\+\/\?x=ab%20c&z='Stop!'%20said%20Fred%20m"\)/m
         end
+
+        stub_request(:get, "http://www.example.com/hello+/?x=ab%20c&z='Stop!'%20said%20Fred%20m")
+        http_request(:get, "http://www.example.com/hello+/?#{NOT_ESCAPED_PARAMS}")
       end
     end
 
     describe "based on query params" do
       it "should return stubbed response when stub declares query params as a hash" do
-        stub_request(:get, "www.example.com").with(:query => {"a" => ["b", "c"]}).to_return(:body => "abc")
-        http_request(:get, "http://www.example.com/?a[]=b&a[]=c").body.should == "abc"
+        stub_request(:get, "www.example.com").with(:query => {"a" => ["b x", "c d"]}).to_return(:body => "abc")
+        http_request(:get, "http://www.example.com/?a[]=b+x&a[]=c%20d").body.should == "abc"
       end
 
       it "should return stubbed response when stub declares query params as a hash" do
@@ -135,13 +138,13 @@ shared_examples_for "stubbing requests" do |*adapter_info|
           it "should match if hash matches body" do
             http_request(
               :post, "http://www.example.com/", :headers => {'Content-Type' => 'application/json'},
-            :body => "{\"a\":\"1\",\"c\":{\"d\":[\"e\",\"f\"]},\"b\":\"five\"}").status.should == "200"
+            :body => "{\"a\":\"1\",\"c\":{\"d\":[\"e\",\"f\"]},\"b\":\"five x\"}").status.should == "200"
           end
 
           it "should match if hash matches body in different form" do
             http_request(
               :post, "http://www.example.com/", :headers => {'Content-Type' => 'application/json'},
-            :body => "{\"a\":\"1\",\"b\":\"five\",\"c\":{\"d\":[\"e\",\"f\"]}}").status.should == "200"
+            :body => "{\"a\":\"1\",\"b\":\"five x\",\"c\":{\"d\":[\"e\",\"f\"]}}").status.should == "200"
           end
 
           it "should match if hash contains date string" do #Crack creates date object

data/spec/acceptance/webmock_shared.rb

@@ -10,8 +10,8 @@ require 'acceptance/shared/complex_cross_concern_behaviors'
 
 unless defined? SAMPLE_HEADERS
   SAMPLE_HEADERS = { "Content-Length" => "8888", "Accept" => "application/json" }
-  ESCAPED_PARAMS = "x=ab%20c&z=%27Stop%21%27%20said%20Fred%2Bm"
-  NOT_ESCAPED_PARAMS = "z='Stop!' said Fred+m&x=ab c"
+  ESCAPED_PARAMS = "x=ab%20c&z=%27Stop%21%27%20said%20Fred%20m"
+  NOT_ESCAPED_PARAMS = "z='Stop!' said Fred m&x=ab c"
 end
 
 shared_examples "with WebMock" do |*adapter_info|

data/spec/unit/util/uri_spec.rb

@@ -47,14 +47,14 @@ URIS_WITH_AUTH =
 
 URIS_WITH_PATH_AND_PARAMS =
 [
-  "www.example.com/my path/?a=my param&b=c+d",
-  "www.example.com/my%20path/?a=my%20param&b=c%2Bd",
-  "www.example.com:80/my path/?a=my param&b=c+d",
-  "www.example.com:80/my%20path/?a=my%20param&b=c%2Bd",
-  "http://www.example.com/my path/?a=my param&b=c+d",
-  "http://www.example.com/my%20path/?a=my%20param&b=c%2Bd",
-  "http://www.example.com:80/my path/?a=my param&b=c+d",
-  "http://www.example.com:80/my%20path/?a=my%20param&b=c%2Bd",
+  "www.example.com/my path/?a=my param&b=c d",
+  "www.example.com/my%20path/?a=my%20param&b=c%20d",
+  "www.example.com:80/my path/?a=my param&b=c d",
+  "www.example.com:80/my%20path/?a=my%20param&b=c%20d",
+  "http://www.example.com/my path/?a=my param&b=c d",
+  "http://www.example.com/my%20path/?a=my%20param&b=c%20d",
+  "http://www.example.com:80/my path/?a=my param&b=c d",
+  "http://www.example.com:80/my%20path/?a=my%20param&b=c%20d",
   ].sort
 
 URIS_WITH_DIFFERENT_PORT =

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 1
   - 10
-  - 1
-  version: 1.10.1
+  - 2
+  version: 1.10.2
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-01 00:00:00 Z
+date: 2013-03-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable