webmock 1.9.3 → 1.10.0

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 1.10.0
+
+* '+' in query params is not treated as space anymore and is encoded as %2B
+
+  Thanks to [goblin](https://github.com/goblin) for reporting this issue.
+
+* added `remove_request_stub` method to the api to allow removing unused stubs i.e.
+
+        stub_get = stub_request(:get, "www.example.com")
+        remove_request_stub(stub_get)
+
+* `assert_requested` and `assert_not_requested` raise an error if a stub object is provided together with a block.
+
 ## 1.9.3
 
 * Fixed issue with unavailable constant Mutex in Ruby < 1.9

data/lib/webmock/api.rb

@@ -21,15 +21,19 @@ module WebMock
     def assert_requested(*args, &block)
       if not args[0].is_a?(WebMock::RequestStub)
         args = convert_uri_method_and_options_to_request_and_options(*args, &block)
+      elsif block
+        raise ArgumentError, "assert_requested with a stub object, doesn't accept blocks"
       end
-      assert_request_requested(*args, &block)
+      assert_request_requested(*args)
     end
 
     def assert_not_requested(*args, &block)
       if not args[0].is_a?(WebMock::RequestStub)
         args = convert_uri_method_and_options_to_request_and_options(*args, &block)
+      elsif block
+        raise ArgumentError, "assert_not_requested with a stub object, doesn't accept blocks"
       end
-      assert_request_not_requested(*args, &block)
+      assert_request_not_requested(*args)
     end
 
     def hash_including(expected)
@@ -42,6 +46,10 @@ module WebMock
       end
     end
 
+    def remove_request_stub(stub)
+      WebMock::StubRegistry.instance.remove_request_stub(stub)
+    end
+
     private
 
     def convert_uri_method_and_options_to_request_and_options(*args, &block)

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 << '=' << CGI.escape(value.to_s) << '&'
+                string << key.to_s << '=' << URI.escape(value.to_s) << '&'
               end
             end
           end

data/lib/webmock/stub_registry.rb

@@ -36,6 +36,12 @@ module WebMock
       stub
     end
 
+    def remove_request_stub(stub)
+      if not request_stubs.delete(stub)
+        raise "Request stub \n\n #{stub.to_s} \n\n is not registered."
+      end
+    end
+
     def registered_request?(request_signature)
       request_stub_for(request_signature)
     end

data/lib/webmock/util/query_mapper.rb

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

data/lib/webmock/util/uri.rb

@@ -18,6 +18,7 @@ module WebMock
           normalized_uri.query = WebMock::Util::QueryMapper.values_to_query(sorted_query_values)
         end
         normalized_uri = normalized_uri.normalize #normalize! is slower
+        normalized_uri.query = normalized_uri.query.gsub("+", "%2B") if normalized_uri.query
         normalized_uri.port = normalized_uri.inferred_port unless normalized_uri.port
         hash[uri] = normalized_uri
       end

data/lib/webmock/version.rb

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

data/spec/acceptance/excon/excon_spec_helper.rb

@@ -5,7 +5,7 @@ module ExconSpecHelper
   def http_request(method, uri, options = {}, &block)
     Excon.defaults[:ssl_verify_peer] = false
     uri      = Addressable::URI.heuristic_parse(uri)
-    uri      = uri.omit(:userinfo).to_s.gsub(' ', '+')
+    uri      = uri.omit(:userinfo).to_s.gsub(' ', '%20')
 
     options  = options.merge(:method => method, :nonblock => false) # Dup and merge
     response = Excon.new(uri).request(options, &block)

data/spec/acceptance/patron/patron_spec_helper.rb

@@ -12,7 +12,7 @@ module PatronSpecHelper
     sess.timeout = 30
     sess.max_redirects = 0
     uri = "#{uri.path}#{uri.query ? '?' : ''}#{uri.query}"
-    uri.gsub!(' ','+')
+    uri.gsub!(' ','%20')
     response = sess.request(method, uri, options[:headers] || {}, {
       :data => options[:body]
     })

data/spec/acceptance/shared/stubbing_requests.rb

@@ -15,6 +15,15 @@ shared_examples_for "stubbing requests" do |*adapter_info|
         stub_request(:get, /.*x=ab c.*/).to_return(:body => "abc")
         http_request(:get, "http://www.example.com/hello/?#{ESCAPED_PARAMS}").body.should == "abc"
       end
+
+      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}")
+        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
+        end
+      end
     end
 
     describe "based on query params" do
@@ -444,4 +453,18 @@ shared_examples_for "stubbing requests" do |*adapter_info|
       end
     end
   end
+
+  describe "when request stub was removed" do
+    it "should raise an error on request" do
+      stub = stub_request(:get, "www.example.com")
+
+      http_request(:get, "http://www.example.com/")
+
+      remove_request_stub(stub)
+
+      lambda {
+        http_request(:get, "http://www.example.com/")
+      }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/))
+    end
+  end
 end

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"
-  NOT_ESCAPED_PARAMS = "z='Stop!' said Fred&x=ab c"
+  ESCAPED_PARAMS = "x=ab%20c&z=%27Stop%21%27%20said%20Fred%2Bm"
+  NOT_ESCAPED_PARAMS = "z='Stop!' said Fred+m&x=ab c"
 end
 
 shared_examples "with WebMock" do |*adapter_info|

data/spec/unit/stub_registry_spec.rb

@@ -9,6 +9,15 @@ describe WebMock::StubRegistry do
     @request_stub = WebMock::RequestStub.new(:get, "www.example.com")
   end
 
+  describe "remove_request_stub" do
+    it "should remove stub from registry" do
+      WebMock::StubRegistry.instance.register_request_stub(@request_stub)
+      WebMock::StubRegistry.instance.registered_request?(@request_signature).should == @request_stub
+      WebMock::StubRegistry.instance.remove_request_stub(@request_stub)
+      WebMock::StubRegistry.instance.registered_request?(@request_signature).should == nil
+    end
+  end
+
   describe "reset!" do
     before(:each) do
       WebMock::StubRegistry.instance.register_request_stub(@request_stub)

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",
-  "www.example.com/my%20path/?a=my%20param&b=c",
-  "www.example.com:80/my path/?a=my param&b=c",
-  "www.example.com:80/my%20path/?a=my%20param&b=c",
-  "http://www.example.com/my path/?a=my param&b=c",
-  "http://www.example.com/my%20path/?a=my%20param&b=c",
-  "http://www.example.com:80/my path/?a=my param&b=c",
-  "http://www.example.com:80/my%20path/?a=my%20param&b=c",
+  "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",
   ].sort
 
 URIS_WITH_DIFFERENT_PORT =

data/spec/unit/webmock_spec.rb

@@ -4,4 +4,4 @@ describe "WebMock version" do
   it "should report version" do
     WebMock.version.should == WebMock::VERSION
   end
-end
+end

data/test/shared_test.rb

@@ -9,6 +9,18 @@ module SharedTest
     @stub_https = stub_http_request(:any, "https://www.example.com")
   end
 
+  def test_assert_requested_with_stub_and_block_raises_error
+    assert_raise ArgumentError do
+      assert_requested(@stub_http) {}
+    end
+  end
+
+  def test_assert_not_requested_with_stub_and_block_raises_error
+    assert_raise ArgumentError do
+      assert_not_requested(@stub_http) {}
+    end
+  end
+
   def test_error_on_non_stubbed_request
     default_ruby_headers = (RUBY_VERSION >= "1.9.1") ? "{'Accept'=>'*/*', 'User-Agent'=>'Ruby'}" : "{'Accept'=>'*/*'}"
     assert_raise_with_message(WebMock::NetConnectNotAllowedError, %r{Real HTTP connections are disabled. Unregistered request: GET http://www.example.net/ with headers}) do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 63
   prerelease: 
   segments: 
   - 1
-  - 9
-  - 3
-  version: 1.9.3
+  - 10
+  - 0
+  version: 1.10.0
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-20 00:00:00 Z
+date: 2013-02-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable