webmock 1.17.4 → 1.18.0

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## 1.18.0
+
+* Updated dependency on Addressable to versions >= 2.3.6
+
+* Added support for matching uris using RFC 6570 (URI Templates)
+
+        uri_template = Addressable::Template.new "www.example.com/{id}/"
+        stub_request(:any, uri_template)
+
+  Thanks to [Max Lincoln](https://github.com/maxlinc)
+
+* Fixed content length calculation for Rack responses with UTF8 body
+
+  Thanks to [Oleg Gritsenko](https://github.com/Claster)
+
+* Add missing Curl::Easy aliases
+
+  Thanks to [Hwan-Joon Choi](https://github.com/hc5duke)
+
+* HTTP Gem >= 0.6.0 compatibility
+
+  Thanks to [Aleksey V. Zapparov](https://github.com/ixti)
+
+* Minitest 4 and 5 compatibility.
+
+  Thanks to [SHIBATA Hiroshi](https://github.com/hsbt)
+
 ## 1.17.4
 
 * Update matchers for RSpec 3's matcher protocol

data/README.md

@@ -212,6 +212,24 @@ stub_request(:any, /.*example.*/)
 Net::HTTP.get('www.example.com', '/')    # ===> Success
 ```
 
+### Matching uris using RFC 6570 - Basic Example
+
+```ruby
+uri_template = Addressable::Template.new "www.example.com/{id}/"
+stub_request(:any, uri_template)
+
+Net::HTTP.get('www.example.com', '/webmock/')    # ===> Success
+```
+
+### Matching uris using RFC 6570 - Advanced Example
+
+```ruby
+uri_template = Addressable::Template.new "www.example.com/thing/{id}.json{?x,y,z}{&other*}"
+stub_request(:any, uri_template)
+
+Net::HTTP.get('www.example.com', '/thing/5.json?x=1&y=2&z=3&anyParam=4')    # ===> Success
+```
+
 ### Matching query params using hash
 
 ```ruby
@@ -596,7 +614,7 @@ WebMock.enable!(:except => [:patron])    #enable WebMock for all libs except Pat
 
 An executed request matches stubbed request if it passes following criteria:
 
-  When request URI matches stubbed request URI string or Regexp pattern<br/>
+  When request URI matches stubbed request URI string, Regexp pattern or RFC 6570 URI Template<br/>
   And request method is the same as stubbed request method or stubbed request method is :any<br/>
   And request body is the same as stubbed request body or stubbed request body is not specified<br/>
   And request headers match stubbed request headers, or stubbed request headers match a subset of request headers, or stubbed request headers are not specified<br/>
@@ -668,6 +686,12 @@ If you provide Regexp to match URI, WebMock will try to match it against every v
 
 I.e `/.*my param.*/` will match `www.example.com/my%20path` because it is equivalent of `www.example.com/my path`
 
+## Matching with URI Templates
+
+If you use [Addressable::Template](https://github.com/sporkmonger/addressable#uri-templates) for matching, then WebMock will defer the matching rules to Addressable, which complies with [RFC 6570](http://tools.ietf.org/html/rfc6570).
+
+If you use any of the WebMock methods for matching query params, then Addressable will be used to match the base URI and WebMock will match the query params.  If you do not, then WebMock will let Addressable match the full URI.
+
 ## Matching headers
 
 WebMock will match request headers against stubbed request headers in the following situations:
@@ -882,6 +906,10 @@ People who submitted patches and new features or suggested improvements. Many th
 * Bo Jeanes
 * Matthew Conway
 * Rob Olson
+* Max Lincoln
+* Oleg Gritsenko
+* Hwan-Joon Choi
+* SHIBATA Hiroshi
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock.rb

@@ -1,6 +1,7 @@
 require 'singleton'
 
 require 'addressable/uri'
+require 'addressable/template'
 require 'crack'
 
 require 'webmock/deprecation'

data/lib/webmock/http_lib_adapters/curb_adapter.rb

@@ -200,12 +200,14 @@ if defined?(Curl)
         @put_data = data if data
         super
       end
+      alias put http_put
 
       def http_post *data
         @webmock_method = :post
         @post_body = data.join('&') if data && !data.empty?
         super
       end
+      alias post http_post
 
       def perform
         @webmock_method ||= :get
@@ -236,6 +238,7 @@ if defined?(Curl)
       def body_str
         @body_str || super
       end
+      alias body body_str
 
       def response_code
         @response_code || super
@@ -244,6 +247,7 @@ if defined?(Curl)
       def header_str
         @header_str || super
       end
+      alias head header_str
 
       def last_effective_url
         @last_effective_url || super

data/lib/webmock/http_lib_adapters/http_gem/client.rb

@@ -0,0 +1,14 @@
+module HTTP
+  class Client
+    alias_method :__perform__, :perform
+
+    def perform(request, options)
+      return __perform__(request, options) unless webmock_enabled?
+      WebMockPerform.new(request) { __perform__(request, options) }.exec
+    end
+
+    def webmock_enabled?
+      ::WebMock::HttpLibAdapters::HttpGemAdapter.enabled?
+    end
+  end
+end

data/lib/webmock/http_lib_adapters/http_gem/request.rb

@@ -0,0 +1,10 @@
+module HTTP
+  class Request
+    def webmock_signature
+      ::WebMock::RequestSignature.new(verb, uri.to_s, {
+        :headers  => headers.to_h,
+        :body     => body
+      })
+    end
+  end
+end

data/lib/webmock/http_lib_adapters/http_gem/response.rb

@@ -0,0 +1,21 @@
+module HTTP
+  class Response
+    def to_webmock
+      webmock_response = ::WebMock::Response.new
+
+      webmock_response.status  = [status, reason]
+      webmock_response.body    = body.to_s
+      webmock_response.headers = headers.to_h
+
+      webmock_response
+    end
+
+    def self.from_webmock(webmock_response)
+      status  = webmock_response.status.first
+      headers = webmock_response.headers || {}
+      body    = Body.new Streamer.new webmock_response.body
+
+      new(status, "1.1", headers, body)
+    end
+  end
+end

data/lib/webmock/http_lib_adapters/http_gem/streamer.rb

@@ -0,0 +1,13 @@
+module HTTP
+  class Response
+    class Streamer
+      def initialize(str)
+        @io = StringIO.new str
+      end
+
+      def readpartial(size = HTTP::Client::BUFFER_SIZE)
+        @io.read size
+      end
+    end
+  end
+end

data/lib/webmock/http_lib_adapters/http_gem/webmock.rb

@@ -0,0 +1,62 @@
+module HTTP
+  class WebMockPerform
+    def initialize(request, &perform)
+      @request = request
+      @perform = perform
+    end
+
+    def exec
+      replay || perform || halt
+    end
+
+    def request_signature
+      unless @request_signature
+        @request_signature = @request.webmock_signature
+        register_request(@request_signature)
+      end
+
+      @request_signature
+    end
+
+    protected
+
+    def response_for_request(signature)
+      ::WebMock::StubRegistry.instance.response_for_request(signature)
+    end
+
+    def register_request(signature)
+      ::WebMock::RequestRegistry.instance.requested_signatures.put(signature)
+    end
+
+    def replay
+      webmock_response = response_for_request request_signature
+
+      return unless webmock_response
+
+      raise Errno::ETIMEDOUT if webmock_response.should_timeout
+      webmock_response.raise_error_if_any
+
+      invoke_callbacks(webmock_response, :real_request => false)
+      ::HTTP::Response.from_webmock webmock_response
+    end
+
+    def perform
+      return unless ::WebMock.net_connect_allowed?(request_signature.uri)
+      response = @perform.call
+      invoke_callbacks(response.to_webmock, :real_request => true)
+      response
+    end
+
+    def halt
+      raise ::WebMock::NetConnectNotAllowedError.new request_signature
+    end
+
+    def invoke_callbacks(webmock_response, options = {})
+      ::WebMock::CallbackRegistry.invoke_callbacks(
+        options.merge({ :lib => :http_gem }),
+        request_signature,
+        webmock_response
+      )
+    end
+  end
+end

data/lib/webmock/http_lib_adapters/http_gem_adapter.rb

@@ -1,170 +1,38 @@
 begin
   require "http"
+  __http_gem_found__ = true
 rescue LoadError
-  # HTTP gem not found
+  __http_gem_found__ = false
 end
 
+if __http_gem_found__
+  WebMock::VersionChecker.new("HTTP Gem", HTTP::VERSION, "0.6.0").check_version!
 
-if defined?(HTTP::Client)
   module WebMock
     module HttpLibAdapters
       class HttpGemAdapter < HttpLibAdapter
-
         adapter_for :http_gem
 
+        class << self
+          def enable!
+            @enabled = true
+          end
 
-        def self.enable!
-          ::HTTP.enable_webmock!
-        end
-
+          def disable!
+            @enabled = false
+          end
 
-        def self.disable!
-          ::HTTP.disable_webmock!
+          def enabled?
+            @enabled
+          end
         end
-
       end
     end
   end
 
-
-  module HTTP
-    class Request
-
-      def webmock_signature
-        ::WebMock::RequestSignature.new(method, uri.to_s, {
-          :headers  => headers,
-          :body     => body
-        })
-      end
-
-    end
-
-
-    class Response
-
-      def to_webmock
-        webmock_response = ::WebMock::Response.new
-
-        webmock_response.status  = [status, reason]
-        webmock_response.body    = body.to_s
-        webmock_response.headers = headers
-
-        webmock_response
-      end
-
-
-      def self.from_webmock(webmock_response)
-        status  = webmock_response.status.first
-        headers = webmock_response.headers || {}
-        body    = webmock_response.body
-
-        new(status, "1.1", headers, body)
-      end
-
-    end
-
-
-    class WebMockPerform
-
-      def initialize request, &perform
-        @request = request
-        @perform = perform
-      end
-
-
-      def exec
-        replay || perform || halt
-      end
-
-
-      def request_signature
-        unless @request_signature
-          @request_signature = @request.webmock_signature
-          register_request(@request_signature)
-        end
-
-        @request_signature
-      end
-
-
-      protected
-
-
-      def response_for_request(signature)
-        ::WebMock::StubRegistry.instance.response_for_request(signature)
-      end
-
-
-      def register_request(signature)
-        ::WebMock::RequestRegistry.instance.requested_signatures.put(signature)
-      end
-
-
-      def replay
-        webmock_response = response_for_request(request_signature)
-
-        return unless webmock_response
-
-        raise Errno::ETIMEDOUT if webmock_response.should_timeout
-        webmock_response.raise_error_if_any
-
-        invoke_callbacks(webmock_response, :real_request => false)
-        ::HTTP::Response.from_webmock webmock_response
-      end
-
-
-      def perform
-        return unless ::WebMock.net_connect_allowed?(request_signature.uri)
-        response = @perform.call
-        invoke_callbacks(response.to_webmock, :real_request => true)
-        response
-      end
-
-
-      def halt
-        raise ::WebMock::NetConnectNotAllowedError.new request_signature
-      end
-
-
-      def invoke_callbacks webmock_response, options = {}
-        ::WebMock::CallbackRegistry.invoke_callbacks(
-          options.merge({ :lib => :http_gem }),
-          request_signature,
-          webmock_response
-        )
-      end
-
-    end
-
-
-    class Client
-
-      alias :__perform__ :perform
-
-      def perform request, options
-        return __perform__(request, options) unless ::HTTP.webmock_enabled?
-        WebMockPerform.new(request) { __perform__(request, options) }.exec
-      end
-
-    end
-
-
-    class << self
-
-      def enable_webmock!
-        @webmock_enabled = true
-      end
-
-
-      def disable_webmock!
-        @webmock_enabled = false
-      end
-
-
-      def webmock_enabled?
-        @webmock_enabled
-      end
-
-    end
-  end
+  require "webmock/http_lib_adapters/http_gem/client"
+  require "webmock/http_lib_adapters/http_gem/request"
+  require "webmock/http_lib_adapters/http_gem/response"
+  require "webmock/http_lib_adapters/http_gem/streamer"
+  require "webmock/http_lib_adapters/http_gem/webmock"
 end

data/lib/webmock/minitest.rb

@@ -1,6 +1,6 @@
 begin
   require 'minitest/test'
-  test_class= MiniTest::Test
+  test_class = Minitest::Test
   assertions = "assertions"
 rescue LoadError
   require "minitest/unit"
@@ -30,4 +30,10 @@ test_class.class_eval do
   end
 end
 
-WebMock::AssertionFailure.error_class = MiniTest::Assertion
+begin
+  error_class = MiniTest::Assertion
+rescue NameError
+  error_class = Minitest::Assertion
+end
+
+WebMock::AssertionFailure.error_class = error_class

data/lib/webmock/rack_response.rb

@@ -32,7 +32,7 @@ module WebMock
         # CGI variables specified by Rack
         'REQUEST_METHOD' => request.method.to_s.upcase,
         'CONTENT_TYPE'   => headers.delete('Content-Type'),
-        'CONTENT_LENGTH' => body.size,
+        'CONTENT_LENGTH' => body.bytesize,
         'PATH_INFO'      => uri.path,
         'QUERY_STRING'   => uri.query || '',
         'SERVER_NAME'    => uri.host,

data/lib/webmock/request_pattern.rb

@@ -56,6 +56,8 @@ module WebMock
     def create_uri_pattern(uri)
       if uri.is_a?(Regexp)
         URIRegexpPattern.new(uri)
+      elsif uri.is_a?(Addressable::Template)
+        URIAddressablePattern.new(uri)
       else
         URIStringPattern.new(uri)
       end
@@ -83,7 +85,12 @@ module WebMock
     include RSpecMatcherDetector
 
     def initialize(pattern)
-      @pattern = pattern.is_a?(Addressable::URI) ? pattern : WebMock::Util::URI.normalize_uri(pattern)
+      @pattern = case pattern
+      when Addressable::URI, Addressable::Template
+        pattern
+      else
+          WebMock::Util::URI.normalize_uri(pattern)
+      end
       @query_params = nil
     end
 
@@ -119,6 +126,30 @@ module WebMock
     end
   end
 
+  class URIAddressablePattern  < URIPattern
+    def matches?(uri)
+      if @query_params.nil?
+        # Let Addressable check the whole URI
+        WebMock::Util::URI.variations_of_uri_as_strings(uri).any? { |u| @pattern.match(u) }
+      else
+        # WebMock checks the query, Addressable checks everything else
+        WebMock::Util::URI.variations_of_uri_as_strings(uri.omit(:query)).any? { |u| @pattern.match(u) } &&
+        (@query_params.nil? || @query_params == WebMock::Util::QueryMapper.query_to_values(uri.query))
+      end
+    end
+
+    def add_query_params(query_params)
+      warn "WebMock warning: ignoring query params in RFC 6570 template and checking them with WebMock"
+      super(query_params)
+    end
+
+    def to_s
+      str = @pattern.pattern.inspect
+      str += " with variables #{@pattern.variables.inspect}" if @pattern.variables
+      str
+    end
+  end
+
   class URIStringPattern < URIPattern
     def matches?(uri)
       if @pattern.is_a?(Addressable::URI)

data/lib/webmock/version.rb

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

data/spec/acceptance/curb/curb_spec.rb

@@ -331,6 +331,15 @@ unless RUBY_PLATFORM =~ /java/
         c.http(:GET)
         c.body_str.should == "abc"
       end
+
+      it "should alias body to body_str" do
+        stub_request(:get, "www.example.com").to_return(:body => "abc")
+
+        c = Curl::Easy.new
+        c.url = "http://www.example.com"
+        c.http(:GET)
+        c.body.should == "abc"
+      end
     end
 
     describe "using #http_* methods for requests" do

data/spec/acceptance/http_gem/http_gem_spec.rb

@@ -5,50 +5,46 @@ require "acceptance/webmock_shared"
 require "acceptance/http_gem/http_gem_spec_helper"
 
 describe "HTTP Gem" do
-
   include HttpGemSpecHelper
 
-
   include_examples "with WebMock", :no_status_message
 
+  context "streaming body" do
+    let(:response) { HTTP.get "http://example.com" }
+    before { stub_simple_request "example.com", 302, {}, "abc" }
+
+    it "works as if it was streamed from socket" do
+      expect(response.body.readpartial 1).to eq "a"
+    end
 
-  context "when not following redirects" do
+    it "fails if body was already streamed" do
+      response.body.to_s
+      expect { response.body.readpartial 1 }.to raise_error
+    end
+  end
 
+  context "without following redirects" do
     let(:response) { http_request(:get, "http://example.com") }
     let(:headers)  { response.headers }
 
     it "stops on first request" do
-      stub_simple_request("example.com", 302, "Location" => "www.example.com")
+      stub_simple_request("example.com", 302, "Location" => "http://www.example.com")
       stub_simple_request("www.example.com")
 
       expect(headers).to include "Host" => "example.com"
     end
-
   end
 
-
-  context "when following redirects" do
-
-    let(:response) { http_request(:get, "http://example.com", :follow => true) }
+  context "following redirects" do
+    let(:options)  { { :follow => true } }
+    let(:response) { http_request(:get, "http://example.com", options) }
     let(:headers)  { response.headers }
 
-
     it "returns response of destination" do
-      stub_simple_request("example.com", 302, "Location" => "www.example.com")
+      stub_simple_request("example.com", 302, "Location" => "http://www.example.com")
       stub_simple_request("www.example.com")
 
       expect(headers).to include "Host" => "www.example.com"
     end
-
-
-    it "works with more than one redirect" do
-      stub_simple_request("example.com", 302, "Location" => "www.example.com")
-      stub_simple_request("www.example.com", 302, "Location" => "blog.example.com")
-      stub_simple_request("blog.example.com")
-
-      expect(headers).to include "Host" => "blog.example.com"
-    end
-
   end
-
 end

data/spec/acceptance/http_gem/http_gem_spec_helper.rb

@@ -1,52 +1,43 @@
 require "ostruct"
 
-
 module HttpGemSpecHelper
-
-  def http_request(method, uri, options = {}, &block)
-    response = HTTP.request(method, normalize_uri(uri), options).response
+  def http_request(method, uri, options = {})
+    response = HTTP.request(method, normalize_uri(uri), options)
 
     OpenStruct.new({
-      :body       => response.body,
-      :headers    => normalize_headers(response.headers),
+      :body       => response.body.to_s,
+      :headers    => normalize_headers(response.headers.to_h),
       :status     => response.status.to_s,
       :message    => response.reason
     })
   end
 
-
-  def normalize_uri(uri)
-    Addressable::URI.heuristic_parse(uri).normalize.to_s
-  end
-
-
-  def normalize_headers headers
-    WebMock::Util::Headers.normalize_headers(Hash[headers.map { |k, v|
-      [k, v.is_a?(Array) ? v.join(", ") : v]
-    }])
-  end
-
-
-  def stub_simple_request host, status = 200, headers = {}
-    stub_request(:any, host).to_return({
-      :status   => status,
-      :headers  => headers.merge({ "Host" => host })
-    })
-  end
-
-
   def client_timeout_exception_class
     Errno::ETIMEDOUT
   end
 
-
   def connection_refused_exception_class
     Errno::ECONNREFUSED
   end
 
-
   def http_library
     :http_gem
   end
 
+  def normalize_uri(uri)
+    Addressable::URI.heuristic_parse(uri).normalize.to_s
+  end
+
+  def normalize_headers(headers)
+    headers = Hash[headers.map { |k, v| [k, Array(v).join(", ")] }]
+    WebMock::Util::Headers.normalize_headers headers
+  end
+
+  def stub_simple_request(host, status = 200, headers = {}, body = nil)
+    stub_request(:any, host).to_return({
+      :status   => status,
+      :headers  => headers.merge({ "Host" => host }),
+      :body     => body
+    })
+  end
 end

data/spec/support/my_rack_app.rb

@@ -24,7 +24,9 @@ class MyRackApp
       when ['GET', '/locked']
         [200, {}, ["Single threaded response."]]
       when ['POST', '/greet']
-        name = env["rack.input"].read[/name=([^&]*)/, 1] || "World"
+        name = env["rack.input"].read(env["CONTENT_LENGTH"])
+        name = name.force_encoding("UTF-8") if name.respond_to? :force_encoding
+        name = name[/name=([^&]*)/, 1] || "World"
         [200, {}, ["Good to meet you, #{name}!"]]
       when ['GET', '/compute']
         if env['SERVER_PORT'] == 80 && env["SCRIPT_NAME"] == ""

data/spec/unit/rack_response_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 describe WebMock::RackResponse do
@@ -49,6 +50,15 @@ describe WebMock::RackResponse do
     response.body.should include('Good to meet you, Jimmy!')
   end
 
+  it "should send params with proper content length if params have non-ascii symbols" do
+    request = WebMock::RequestSignature.new(:post, 'www.example.com/greet',
+      :body => 'name=Олег'
+    )
+
+    response = @rack_response.evaluate(request)
+    response.body.should include('Good to meet you, Олег!')
+  end
+
   describe 'rack error output' do
     before :each do
       @original_stderr = $stderr

data/spec/unit/request_pattern_spec.rb

@@ -99,6 +99,16 @@ describe WebMock::RequestPattern do
         should match(WebMock::RequestSignature.new(:get, "www.example.com"))
     end
 
+    it "should match if uri Addressable::Template pattern matches unescaped form of request uri" do
+      WebMock::RequestPattern.new(:get, Addressable::Template.new("www.example.com/{any_path}")).
+        should match(WebMock::RequestSignature.new(:get, "www.example.com/my%20path"))
+    end
+
+    it "should match if uri Addressable::Template pattern matches request uri" do
+      WebMock::RequestPattern.new(:get, Addressable::Template.new("www.example.com")).
+        should match(WebMock::RequestSignature.new(:get, "www.example.com"))
+    end
+
     it "should match for uris with same parameters as pattern" do
       WebMock::RequestPattern.new(:get, "www.example.com?a=1&b=2").
         should match(WebMock::RequestSignature.new(:get, "www.example.com?a=1&b=2"))
@@ -136,6 +146,26 @@ describe WebMock::RequestPattern do
           should match(WebMock::RequestSignature.new(:get, "www.example.com/?a=a b"))
       end
 
+      it "should match if uri Addressable::Template pattern matches uri without parameter value and request has escaped parameters" do
+        WebMock::RequestPattern.new(:get, Addressable::Template.new("www.example.com/{?a}")).
+          should match(WebMock::RequestSignature.new(:get, "www.example.com/?a=a%20b"))
+      end
+
+      it "should match if uri Addressable::Template pattern matches uri without parameter value and request has unescaped parameters"  do
+        WebMock::RequestPattern.new(:get, Addressable::Template.new("www.example.com/{?a}")).
+          should match(WebMock::RequestSignature.new(:get, "www.example.com/?a=a b"))
+      end
+
+      it "should match if uri Addressable::Template pattern matches uri with unescaped parameter value and request has unescaped parameters"  do
+        WebMock::RequestPattern.new(:get, Addressable::Template.new("www.example.com/?a=a b")).
+          should match(WebMock::RequestSignature.new(:get, "www.example.com/?a=a b"))
+      end
+
+      it "should match if uri Addressable::Template pattern matches uri with escaped parameter value and request has escaped parameters"  do
+        WebMock::RequestPattern.new(:get, Addressable::Template.new("www.example.com/?a=a%20b")).
+          should match(WebMock::RequestSignature.new(:get, "www.example.com/?a=a%20b"))
+      end
+
     end
 
     describe "when matching requests on query params" do
@@ -176,6 +206,42 @@ describe WebMock::RequestPattern do
         end
       end
 
+      describe "when uri is described as Addressable::Template" do
+        it "should raise error if query params are specified" do
+          WebMock::RequestPattern.new(:get, Addressable::Template.new("www.example.com"), :query => {"a" => ["b", "c"]}).
+            should match(WebMock::RequestSignature.new(:get, "www.example.com?a[]=b&a[]=c"))
+        end
+
+        it "should match request query params if params don't match" do
+          WebMock::RequestPattern.new(:get, Addressable::Template.new("www.example.com"), :query => {"x" => ["b", "c"]}).
+            should_not match(WebMock::RequestSignature.new(:get, "www.example.com?a[]=b&a[]=c"))
+        end
+
+        it "should match when query params are declared as HashIncluding matcher matching params" do
+          WebMock::RequestPattern.new(:get, Addressable::Template.new("www.example.com"),
+          :query => WebMock::Matchers::HashIncludingMatcher.new({"a" => ["b", "c"]})).
+            should match(WebMock::RequestSignature.new(:get, "www.example.com?a[]=b&a[]=c&b=1"))
+        end
+
+        it "should not match when query params are declared as HashIncluding matcher not matching params" do
+          WebMock::RequestPattern.new(:get, Addressable::Template.new("www.example.com"),
+          :query => WebMock::Matchers::HashIncludingMatcher.new({"x" => ["b", "c"]})).
+            should_not match(WebMock::RequestSignature.new(:get, "www.example.com?a[]=b&a[]=c&b=1"))
+        end
+
+        it "should match when query params are declared as RSpec HashIncluding matcher matching params" do
+          WebMock::RequestPattern.new(:get, Addressable::Template.new("www.example.com"),
+          :query => RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher.new({"a" => ["b", "c"]})).
+            should match(WebMock::RequestSignature.new(:get, "www.example.com?a[]=b&a[]=c&b=1"))
+        end
+
+        it "should not match when query params are declared as RSpec HashIncluding matcher not matching params" do
+          WebMock::RequestPattern.new(:get, Addressable::Template.new("www.example.com"),
+          :query => RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher.new({"a" => ["b", "d"]})).
+            should_not match(WebMock::RequestSignature.new(:get, "www.example.com?a[]=b&a[]=c&b=1"))
+        end
+      end
+
       describe "when uri is described as string" do
         it "should match when query params are the same as declared in hash" do
           WebMock::RequestPattern.new(:get, "www.example.com", :query => {"a" => ["b", "c"]}).

data/webmock.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = 'webmock'
 
-  s.add_dependency 'addressable', '>= 2.2.7'
+  s.add_dependency 'addressable', '>= 2.3.6'
   s.add_dependency 'crack', '>=0.3.2'
 
   s.add_development_dependency 'rspec',           '~> 2.10'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 91
+  hash: 95
   prerelease: 
   segments: 
   - 1
-  - 17
-  - 4
-  version: 1.17.4
+  - 18
+  - 0
+  version: 1.18.0
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-02 00:00:00 +01:00
+date: 2014-05-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15
         segments: 
         - 2
-        - 2
-        - 7
-        version: 2.2.7
+        - 3
+        - 6
+        version: 2.3.6
   prerelease: false
   requirement: *id001
   name: addressable
@@ -249,6 +249,11 @@ files:
 - lib/webmock/http_lib_adapters/em_http_request/em_http_request_1_x.rb
 - lib/webmock/http_lib_adapters/em_http_request_adapter.rb
 - lib/webmock/http_lib_adapters/excon_adapter.rb
+- lib/webmock/http_lib_adapters/http_gem/client.rb
+- lib/webmock/http_lib_adapters/http_gem/request.rb
+- lib/webmock/http_lib_adapters/http_gem/response.rb
+- lib/webmock/http_lib_adapters/http_gem/streamer.rb
+- lib/webmock/http_lib_adapters/http_gem/webmock.rb
 - lib/webmock/http_lib_adapters/http_gem_adapter.rb
 - lib/webmock/http_lib_adapters/http_lib_adapter.rb
 - lib/webmock/http_lib_adapters/http_lib_adapter_registry.rb