webmock 3.0.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b25e1f8ad8f3a8ffa79b1e54d0709069f9162b52
-  data.tar.gz: 8169ef32ad67fecba074d929fb6d584410950617
+  metadata.gz: dcc2534597446961ba1489ab97892043fde75a6f
+  data.tar.gz: 1ef34b8d183d56935d2991b73cfa183d172f1df5
 SHA512:
-  metadata.gz: 3daea98f13930398bd12722ff33b727c4c3b02ce41f2aeb3060d437d246ed5284c0737979bea0b7a46fa6dba6c24e90b1e4519d9b7f4e6d8d9e8d212869d9469
-  data.tar.gz: 8f9fdee207513b9741f6245ed4b575120bd3232165edfa941a2f8113b11a2413f55945a5e5ce160cfb12da455545282b9e3f766903940fe7b878f49b5b59dbb9
+  metadata.gz: f5ed61bb690ad3b649b944d2fbfe5d6c636303befe3ef378a3096dc17aa087fbb19ea36f73623400ae97bf20a30decb864ff32ba3fd9c0e452ef4dbf5b75e060
+  data.tar.gz: e6d8db01788d4f7684cece257af0efa5ae975c2f194cf72c907883a212e35534a6e281d5ef8fa14cf6dc44d5e6b719464941592fa9cbbd86752124569e27774f

data/.travis.yml

@@ -1,14 +1,14 @@
+before_install:
+  - gem update bundler
+
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.2.1
-  - 2.2.3
-  - 2.3.0
-  - 2.4.0
+  - 2.2.8
+  - 2.3.5
+  - 2.4.2
   - rbx-2
   - ruby-head
   - jruby-9.0.5.0
-  - jruby-9.1.5.0
+  - jruby-9.1.13.0
   - jruby-head
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,5 +1,65 @@
 # Changelog
 
+## 3.2.0
+
+ * Automatically disable WebMock after Rspec suite
+
+    Thanks to [Michał Matyas](https://github.com/d4rky-pl)
+
+ * Fixed bug when handling redirection using Curb.
+
+    Thanks to [Olia Kremmyda](https://github.com/Olia-Kremmyda)
+
+
+## 3.1.1
+
+  * Warning message is displayed only once when adding query params to URIAddressablePattern.
+
+## 3.1.0
+
+  * http.rb 3.0.0 compatibility
+
+    Thanks to [Piotr Boniecki](https://github.com/Bonias)
+
+  * Typhoeus 1.3.0 support
+
+    Thanks to [NARUSE, Yui](https://github.com/nurse)
+
+  * Added support for matching partial query params using hash_excluding
+
+        stub_request(:get, "www.example.com").
+          with(query: hash_excluding({"a" => "b"}))
+
+        RestClient.get("http://www.example.com/?a=b")    # ===> Failure
+        RestClient.get("http://www.example.com/?a=c")    # ===> Success
+
+    Thanks to [Olexandr Hoshylyk](https://github.com/Warrior109)
+
+  * Added MRI 2.3+ frozen string literal compatibility
+
+    Thanks to [Pat Allan](https://github.com/pat)
+
+  * Ensured that HTTPClient adapter does not yield block on empty response body if a block is provided
+
+    Thanks to [NARUSE, Yui](https://github.com/nurse)
+
+  * Fixed issue with `to_timeout` incorrectly raising `HTTP::ConnectionError` instead of `HTTP::TimeoutError` when using http.rb
+
+    Thanks to [Rick Song](https://github.com/RickCSong)
+
+  * Fixed problem with `response.connection.close` method being undefined when using http.rb
+
+    Thanks to [Janko Marohnić](https://github.com/janko-m)
+
+  * Fixed problem with matching Net::HTTP request header values assigned as numbers.
+
+    Thanks to [Felipe Constantino de Oliveira](https://github.com/felipecdo) for reporting the issue.
+
+  * Fixed problem with Net::HTTP adapter converting empty response body to nil for non 204 responses.
+
+    Thanks to [Jeffrey Charles](https://github.com/jeffcharles) for reporting the issue.
+
+
 ## 3.0.1
 
   * Suppressed \`warning: \`&' interpreted as argument prefix\`

data/README.md

@@ -32,8 +32,6 @@ Supported HTTP libraries
 Supported Ruby Interpreters
 ---------------------------
 
-* MRI 2.0
-* MRI 2.1
 * MRI 2.2
 * MRI 2.3
 * MRI 2.4
@@ -273,6 +271,16 @@ stub_request(:get, "www.example.com").
 RestClient.get("http://www.example.com/?a[]=b&a[]=c&x=1")    # ===> Success
 ```
 
+### Matching partial query params using hash_excluding
+
+```ruby
+stub_request(:get, "www.example.com").
+  with(query: hash_excluding({"a" => "b"}))
+
+RestClient.get("http://www.example.com/?a=b")    # ===> Failure
+RestClient.get("http://www.example.com/?a=c")    # ===> Success
+```
+
 ### Stubbing with custom response
 
 ```ruby
@@ -1035,6 +1043,14 @@ People who submitted patches and new features or suggested improvements. Many th
 * George Ulmer
 * Christof Koenig
 * Chung-Yi Chi
+* Olexandr Hoshylyk
+* Janko Marohnić
+* Pat Allan
+* Rick Song
+* NARUSE, Yui
+* Piotr Boniecki
+* Olia Kremmyda
+* Michał Matyas
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/api.rb

@@ -54,6 +54,14 @@ module WebMock
       end
     end
 
+    def hash_excluding(*args)
+      if defined?(super)
+        super
+      else
+        WebMock::Matchers::HashExcludingMatcher.new(anythingize_lonely_keys(*args))
+      end
+    end
+
     def remove_request_stub(stub)
       WebMock::StubRegistry.instance.remove_request_stub(stub)
     end

data/lib/webmock/http_lib_adapters/curb_adapter.rb

@@ -153,7 +153,7 @@ if defined?(Curl)
         @body_str = webmock_response.body
         @response_code = webmock_response.status[0]
 
-        @header_str = "HTTP/1.1 #{webmock_response.status[0]} #{webmock_response.status[1]}\r\n"
+        @header_str = "HTTP/1.1 #{webmock_response.status[0]} #{webmock_response.status[1]}\r\n".dup
 
         @on_debug.call(@header_str, 1) if defined?( @on_debug )
 
@@ -183,7 +183,7 @@ if defined?(Curl)
         self.url = location
 
         curb_or_webmock do
-          send( "http_#{@webmock_method}_without_webmock" )
+          send( :http, {'method' => @webmock_method} )
         end
 
         self.url = first_url

data/lib/webmock/http_lib_adapters/excon_adapter.rb

@@ -92,7 +92,7 @@ if defined?(Excon)
         end
 
         def self.to_query(hash)
-          string = ""
+          string = "".dup
           for key, values in hash
             if values.nil?
               string << key.to_s << '&'
@@ -152,7 +152,7 @@ if defined?(Excon)
   end
 
   Excon::Connection.class_eval do
-    def self.new(args)
+    def self.new(args = {})
       args.delete(:__construction_args)
       super(args).tap do |instance|
         instance.data[:__construction_args] = args

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

@@ -1,9 +1,15 @@
 module HTTP
   class Request
     def webmock_signature
+      request_body = if defined?(HTTP::Request::Body)
+                       ''.tap { |string| body.each { |part| string << part } }
+                     else
+                       body
+                     end
+
       ::WebMock::RequestSignature.new(verb, uri.to_s, {
         headers: headers.to_h,
-        body: body
+        body: request_body
       })
     end
   end

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

@@ -17,6 +17,10 @@ module HTTP
         @io.read size
       end
 
+      def close
+        @io.close
+      end
+
       def sequence_id
         -1
       end

data/lib/webmock/http_lib_adapters/http_rb/webmock.rb

@@ -43,7 +43,7 @@ module HTTP
 
     def raise_timeout_error
       raise Errno::ETIMEDOUT if HTTP::VERSION < "1.0.0"
-      raise HTTP::ConnectionError, "connection error: #{Errno::ETIMEDOUT.new}"
+      raise HTTP::TimeoutError, "connection error: #{Errno::ETIMEDOUT.new}"
     end
 
     def perform

data/lib/webmock/http_lib_adapters/httpclient_adapter.rb

@@ -75,8 +75,10 @@ if defined?(::HTTPClient)
         elsif block
           body = ''
           do_get_block_without_webmock(req, proxy, conn) do |http_res, chunk|
-            body += chunk
-            block.call(http_res, chunk)
+            if chunk && chunk.bytesize > 0
+              body += chunk
+              block.call(http_res, chunk)
+            end
           end
         else
           do_get_block_without_webmock(req, proxy, conn)
@@ -117,7 +119,7 @@ if defined?(::HTTPClient)
       raise HTTPClient::TimeoutError if webmock_response.should_timeout
       webmock_response.raise_error_if_any
 
-      block.call(response, body) if block
+      block.call(response, body) if block && body && body.bytesize > 0
 
       response
     end

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -154,7 +154,7 @@ module WebMock
         def build_net_http_response(webmock_response, &block)
           response = Net::HTTPResponse.send(:response_class, webmock_response.status[0].to_s).new("1.0", webmock_response.status[0].to_s, webmock_response.status[1])
           body = webmock_response.body
-          body = nil if body.to_s == ''
+          body = nil if webmock_response.status[0].to_s == '204'
 
           response.instance_variable_set(:@body, body)
           webmock_response.headers.to_a.each do |name, values|
@@ -258,7 +258,7 @@ module Net  #:nodoc: all
   class WebMockNetBufferedIO < BufferedIO
     def initialize(io, read_timeout: 60, continue_timeout: nil, debug_output: nil)
       @read_timeout = read_timeout
-      @rbuf = ''
+      @rbuf = ''.dup
       @debug_output = debug_output
 
       @io = case io

data/lib/webmock/http_lib_adapters/patron_adapter.rb

@@ -106,11 +106,11 @@ if defined?(::Patron)
           header_data   = ([status_line] + header_fields).join("\r\n")
 
           ::Patron::Response.new(
-            "",
+            "".dup,
             webmock_response.status[0],
             0,
             header_data,
-            webmock_response.body,
+            webmock_response.body.dup,
             default_response_charset
           )
         end

data/lib/webmock/matchers/any_arg_matcher.rb

@@ -0,0 +1,13 @@
+module WebMock
+  module Matchers
+    # this is a based on RSpec::Mocks::ArgumentMatchers::AnyArgMatcher
+    class AnyArgMatcher
+      def initialize(ignore)
+      end
+
+      def ==(other)
+        true
+      end
+    end
+  end
+end

data/lib/webmock/matchers/hash_argument_matcher.rb

@@ -0,0 +1,21 @@
+module WebMock
+  module Matchers
+    # Base class for Hash matchers
+    # https://github.com/rspec/rspec-mocks/blob/master/lib/rspec/mocks/argument_matchers.rb
+    class HashArgumentMatcher
+      def initialize(expected)
+        @expected = Hash[WebMock::Util::HashKeysStringifier.stringify_keys!(expected, deep: true).sort]
+      end
+
+      def ==(_actual, &block)
+        @expected.all?(&block)
+      rescue NoMethodError
+        false
+      end
+
+      def self.from_rspec_matcher(matcher)
+        new(matcher.instance_variable_get(:@expected))
+      end
+    end
+  end
+end

data/lib/webmock/matchers/hash_excluding_matcher.rb

@@ -0,0 +1,15 @@
+module WebMock
+  module Matchers
+    # this is a based on RSpec::Mocks::ArgumentMatchers::HashExcludingMatcher
+    # https://github.com/rspec/rspec-mocks/blob/master/lib/rspec/mocks/argument_matchers.rb
+    class HashExcludingMatcher < HashArgumentMatcher
+      def ==(actual)
+        super { |key, value| !actual.key?(key) || value != actual[key] }
+      end
+
+      def inspect
+        "hash_excluding(#{@expected.inspect})"
+      end
+    end
+  end
+end

data/lib/webmock/matchers/hash_including_matcher.rb

@@ -1,14 +1,10 @@
 module WebMock
   module Matchers
-    #this is a based on RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher
-    #https://github.com/rspec/rspec-mocks/blob/master/lib/rspec/mocks/argument_matchers.rb
-    class HashIncludingMatcher
-      def initialize(expected)
-        @expected = Hash[WebMock::Util::HashKeysStringifier.stringify_keys!(expected, deep: true).sort]
-      end
-
+    # this is a based on RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher
+    # https://github.com/rspec/rspec-mocks/blob/master/lib/rspec/mocks/argument_matchers.rb
+    class HashIncludingMatcher < HashArgumentMatcher
       def ==(actual)
-        @expected.all? {|k,v| actual.has_key?(k) && v === actual[k]}
+        super { |key, value| actual.key?(key) && value === actual[key] }
       rescue NoMethodError
         false
       end
@@ -16,21 +12,6 @@ module WebMock
       def inspect
         "hash_including(#{@expected.inspect})"
       end
-
-      def self.from_rspec_matcher(matcher)
-        new(matcher.instance_variable_get(:@expected))
-      end
-    end
-
-    #this is a based on RSpec::Mocks::ArgumentMatchers::AnyArgMatcher
-    class AnyArgMatcher
-      def initialize(ignore)
-      end
-
-      def ==(other)
-        true
-      end
     end
-
   end
 end

data/lib/webmock/rack_response.rb

@@ -17,7 +17,7 @@ module WebMock
     end
 
     def body_from_rack_response(response)
-      body = ""
+      body = "".dup
       response.each { |line| body << line }
       response.close if response.respond_to?(:close)
       return body

data/lib/webmock/request_execution_verifier.rb

@@ -53,9 +53,8 @@ module WebMock
 
     def failure_message_phrase(is_negated=false)
       negation = is_negated ? "was not" : "was"
-      text = "The request #{request_pattern} #{negation} expected to execute #{quantity_phrase(is_negated)}but it executed #{times(times_executed)}"
-      text << self.class.executed_requests_message
-      text
+      "The request #{request_pattern} #{negation} expected to execute #{quantity_phrase(is_negated)}but it executed #{times(times_executed)}" +
+        self.class.executed_requests_message
     end
 
     def quantity_phrase(is_negated=false)

data/lib/webmock/request_pattern.rb

@@ -4,6 +4,10 @@ module WebMock
     def rSpecHashIncludingMatcher?(matcher)
       matcher.class.name =~ /R?Spec::Mocks::ArgumentMatchers::HashIncludingMatcher/
     end
+
+    def rSpecHashExcludingMatcher?(matcher)
+      matcher.class.name =~ /R?Spec::Mocks::ArgumentMatchers::HashExcludingMatcher/
+    end
   end
 
   class RequestPattern
@@ -37,7 +41,7 @@ module WebMock
     end
 
     def to_s
-      string = "#{@method_pattern.to_s.upcase}"
+      string = "#{@method_pattern.to_s.upcase}".dup
       string << " #{@uri_pattern.to_s}"
       string << " with body #{@body_pattern.to_s}" if @body_pattern
       string << " with headers #{@headers_pattern.to_s}" if @headers_pattern
@@ -115,10 +119,13 @@ module WebMock
     def add_query_params(query_params)
       @query_params = if query_params.is_a?(Hash)
         query_params
-      elsif query_params.is_a?(WebMock::Matchers::HashIncludingMatcher)
+      elsif query_params.is_a?(WebMock::Matchers::HashIncludingMatcher) \
+              || query_params.is_a?(WebMock::Matchers::HashExcludingMatcher)
         query_params
       elsif rSpecHashIncludingMatcher?(query_params)
         WebMock::Matchers::HashIncludingMatcher.from_rspec_matcher(query_params)
+      elsif rSpecHashExcludingMatcher?(query_params)
+        WebMock::Matchers::HashExcludingMatcher.from_rspec_matcher(query_params)
       else
         WebMock::Util::QueryMapper.query_to_values(query_params, notation: Config.instance.query_values_notation)
       end
@@ -157,7 +164,11 @@ module WebMock
     end
 
     def add_query_params(query_params)
-      warn "WebMock warning: ignoring query params in RFC 6570 template and checking them with WebMock"
+      @@add_query_params_warned ||= false
+      if not @@add_query_params_warned
+        @@add_query_params_warned = true
+        warn "WebMock warning: ignoring query params in RFC 6570 template and checking them with WebMock"
+      end
       super(query_params)
     end
 

data/lib/webmock/request_registry.rb

@@ -23,7 +23,7 @@ module WebMock
       if requested_signatures.hash.empty?
         "No requests were made."
       else
-        text = ""
+        text = "".dup
         self.requested_signatures.each do |request_signature, times_executed|
           text << "#{request_signature} was made #{times_executed} time#{times_executed == 1 ? '' : 's' }\n"
         end

data/lib/webmock/request_signature.rb

@@ -12,7 +12,7 @@ module WebMock
     end
 
     def to_s
-      string = "#{self.method.to_s.upcase}"
+      string = "#{self.method.to_s.upcase}".dup
       string << " #{WebMock::Util::URI.strip_default_port_from_uri_string(self.uri.to_s)}"
       string << " with body '#{body.to_s}'" if body && body.to_s != ''
       if headers && !headers.empty?

data/lib/webmock/request_signature_snippet.rb

@@ -13,14 +13,14 @@ module WebMock
     def stubbing_instructions
       return unless WebMock.show_stubbing_instructions?
 
-      text = "You can stub this request with the following snippet:\n\n"
-      text << WebMock::StubRequestSnippet.new(request_stub).to_s
+      "You can stub this request with the following snippet:\n\n" +
+        WebMock::StubRequestSnippet.new(request_stub).to_s
     end
 
     def request_stubs
       return if WebMock::StubRegistry.instance.request_stubs.empty?
 
-      text = "registered request stubs:\n"
+      text = "registered request stubs:\n".dup
       WebMock::StubRegistry.instance.request_stubs.each do |stub|
         text << "\n#{WebMock::StubRequestSnippet.new(stub).to_s(false)}"
         add_body_diff(stub, text) if WebMock.show_body_diff?
@@ -50,7 +50,7 @@ module WebMock
     end
 
     def pretty_print_to_string(string_to_print)
-      StringIO.open("") do |stream|
+      StringIO.open("".dup) do |stream|
         PP.pp(string_to_print, stream)
         stream.rewind
         stream.read

data/lib/webmock/rspec.rb

@@ -20,13 +20,19 @@ end
 
 require 'webmock/rspec/matchers'
 
-WebMock.enable!
-
 RSPEC_CONFIGURER.configure { |config|
 
   config.include WebMock::API
   config.include WebMock::Matchers
 
+  config.before(:suite) do
+    WebMock.enable!
+  end
+
+  config.after(:suite) do
+    WebMock.disable!
+  end
+
   config.after(:each) do
     WebMock.reset!
   end

data/lib/webmock/stub_request_snippet.rb

@@ -10,10 +10,10 @@ module WebMock
 
     def to_s(with_response = true)
       request_pattern = @request_stub.request_pattern
-      string = "stub_request(:#{request_pattern.method_pattern.to_s},"
+      string = "stub_request(:#{request_pattern.method_pattern.to_s},".dup
       string << " \"#{request_pattern.uri_pattern.to_s}\")"
 
-      with = ""
+      with = "".dup
 
       if (request_pattern.body_pattern)
         with << "body: #{request_pattern.body_pattern.to_s}"

data/lib/webmock/util/headers.rb

@@ -12,7 +12,7 @@ module WebMock
           [name.to_s.split(/_|-/).map { |segment| segment.capitalize }.join("-"),
            case value
             when Regexp then value
-            when Array then (value.size == 1) ? value.first : value.map {|v| v.to_s}.sort
+            when Array then (value.size == 1) ? value.first.to_s : value.map {|v| v.to_s}.sort
             else value.to_s
            end
           ]
@@ -22,7 +22,7 @@ module WebMock
 
       def self.sorted_headers_string(headers)
         headers = WebMock::Util::Headers.normalize_headers(headers)
-        str = '{'
+        str = '{'.dup
         str << headers.map do |k,v|
           v = case v
             when Regexp then v.inspect

data/lib/webmock/util/query_mapper.rb

@@ -204,7 +204,7 @@ module WebMock::Util
           end
         end
 
-        buffer = ''
+        buffer = ''.dup
         new_query_values.each do |parent, value|
           encoded_parent = ::Addressable::URI.encode_component(
               parent.dup, ::Addressable::URI::CharacterClasses::UNRESERVED
@@ -251,14 +251,14 @@ module WebMock::Util
             ]
           end
           value.sort!
-          buffer = ''
+          buffer = ''.dup
           value.each do |key, val|
             new_parent = options[:notation] != :flat_array ? "#{parent}[#{key}]" : parent
             buffer << "#{to_query(new_parent, val, options)}&"
           end
           buffer.chop
         when ::Array
-          buffer = ''
+          buffer = ''.dup
           value.each_with_index do |val, i|
             new_parent = options[:notation] != :flat_array ? "#{parent}[#{i}]" : parent
             buffer << "#{to_query(new_parent, val, options)}&"

data/lib/webmock/version.rb

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

data/lib/webmock.rb

@@ -18,7 +18,10 @@ require 'webmock/util/json'
 require 'webmock/util/version_checker'
 require 'webmock/util/hash_validator'
 
+require 'webmock/matchers/hash_argument_matcher'
+require 'webmock/matchers/hash_excluding_matcher'
 require 'webmock/matchers/hash_including_matcher'
+require 'webmock/matchers/any_arg_matcher'
 
 require 'webmock/request_pattern'
 require 'webmock/request_signature'

data/minitest/webmock_spec.rb

@@ -43,7 +43,7 @@ require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
     it  "should verify that expect request didn't occur" do
      expected_message = "The request GET http://www.example.com/ was expected to execute 1 time but it executed 0 times"
-     expected_message << "\n\nThe following requests were made:\n\nNo requests were made.\n============================================================"
+     expected_message += "\n\nThe following requests were made:\n\nNo requests were made.\n============================================================"
      assert_fail(expected_message) do
        assert_requested(:get, "http://www.example.com")
      end
@@ -51,7 +51,7 @@ require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
     it  "should verify that expect stub didn't occur" do
      expected_message = "The request ANY http://www.example.com/ was expected to execute 1 time but it executed 0 times"
-     expected_message << "\n\nThe following requests were made:\n\nNo requests were made.\n============================================================"
+     expected_message += "\n\nThe following requests were made:\n\nNo requests were made.\n============================================================"
      assert_fail(expected_message) do
        assert_requested(@stub_http)
      end

data/spec/acceptance/http_rb/http_rb_spec.rb

@@ -70,4 +70,13 @@ describe "HTTP.rb" do
       expect(response.uri.to_s).to eq "http://example.com/foo"
     end
   end
+
+  context "streamer" do
+    it "can be closed" do
+      stub_request :get, "example.com/foo"
+      response = HTTP.get "http://example.com/foo"
+
+      response.connection.close
+    end
+  end
 end

data/spec/acceptance/http_rb/http_rb_spec_helper.rb

@@ -8,7 +8,10 @@ module HttpRbSpecHelper
       chain = chain.basic_auth(user: basic_auth[0], pass: basic_auth[1])
     end
 
-    response = chain.request(method, normalize_uri(uri), options)
+    ssl_ctx = OpenSSL::SSL::SSLContext.new
+    ssl_ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+    response = chain.request(method, normalize_uri(uri), options.merge(ssl_context: ssl_ctx))
 
     OpenStruct.new({
       body: response.body.to_s,
@@ -20,7 +23,7 @@ module HttpRbSpecHelper
 
   def client_timeout_exception_class
     return Errno::ETIMEDOUT if HTTP::VERSION < "1.0.0"
-    HTTP::ConnectionError
+    HTTP::TimeoutError
   end
 
   def connection_refused_exception_class

data/spec/acceptance/httpclient/httpclient_spec.rb

@@ -31,6 +31,13 @@ describe "HTTPClient" do
     expect(response_body).to eq("abc")
   end
 
+  it "should not yield block on empty response if block provided" do
+    stub_request(:get, "www.example.com").to_return(body: "")
+    response_body = ""
+    http_request(:get, "http://www.example.com/"){ raise }
+    expect(response_body).to eq("")
+  end
+
   it "should match requests if headers are the same  but in different order" do
     stub_request(:get, "www.example.com").with(headers: {"a" => ["b", "c"]} )
     expect(http_request(
@@ -48,7 +55,7 @@ describe "HTTPClient" do
 
   it "should work with get_content" do
     stub_request(:get, 'www.example.com').to_return(status: 200, body: 'test', headers: {})
-    str = ''
+    str = ''.dup
     HTTPClient.get_content('www.example.com') do |content|
       str << content
     end

data/spec/acceptance/net_http/net_http_shared.rb

@@ -12,7 +12,7 @@ shared_examples_for "Net::HTTP" do
     end
 
     it "should handle requests with block passed to read_body", net_connect: true do
-      body = ""
+      body = "".dup
       req = Net::HTTP::Get.new("/")
       Net::HTTP.start("localhost", port) do |http|
         http.request(req) do |res|

data/spec/acceptance/net_http/net_http_spec.rb

@@ -293,7 +293,7 @@ describe "Net:HTTP" do
     end
 
     it "should support the after_request callback on an request with block and read_body" do
-      response_body = ''
+      response_body = ''.dup
       http_request(:get, "http://localhost:#{port}/") do |response|
         response.read_body { |fragment| response_body << fragment }
       end
@@ -314,4 +314,18 @@ describe "Net:HTTP" do
       expect(@callback_invocation_count).to eq(1)
     end
   end
+
+  it "should match http headers, even if their values have been set in a request as numbers" do
+    WebMock.disable_net_connect!
+
+    stub_request(:post, "www.example.com").with(headers: {"My-Header" => 99})
+
+    uri = URI.parse('http://www.example.com/')
+    req = Net::HTTP::Post.new(uri.path)
+    req['My-Header'] = 99
+
+    res = Net::HTTP.start(uri.host, uri.port) do |http|
+      http.request(req, '')
+    end
+  end
 end

data/spec/acceptance/patron/patron_spec_helper.rb

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

data/spec/acceptance/shared/request_expectations.rb

@@ -165,6 +165,13 @@ shared_context "request expectations" do |*adapter_info|
             expect(a_request(:get, "www.example.com").with(query: hash_including({"a" => ["b", "c"]}))).to have_been_made
           }.not_to raise_error
         end
+
+        it 'should satisfy expectation if the request was executed with excluding part of query params declared as a hash in a query option' do
+          expect {
+            http_request(:get, "http://www.example.com/?a[]=d&b[]=e&b=1")
+            expect(a_request(:get, "www.example.com").with(query: hash_excluding(a: ['b', 'c']))).to have_been_made
+          }.not_to raise_error
+        end
       end
 
       context "when using flat array notation" do

data/spec/acceptance/shared/stubbing_requests.rb

@@ -63,6 +63,11 @@ shared_examples_for "stubbing requests" do |*adapter_info|
         stub_request(:get, "www.example.com").with(query: hash_including({"a" => ["b", "c"]})).to_return(body: "abc")
         expect(http_request(:get, "http://www.example.com/?a[]=b&a[]=c&b=1").body).to eq("abc")
       end
+
+      it 'should return stubbed response when stub expects exclude part of query params' do
+        stub_request(:get, 'www.example.com').with(query: hash_excluding(a: ['b', 'c'])).to_return(body: 'abc')
+        expect(http_request(:get, 'http://www.example.com/?a[]=c&a[]=d&b=1').body).to eq('abc')
+      end
     end
 
     describe "based on method" do

data/spec/acceptance/typhoeus/typhoeus_hydra_spec.rb

@@ -127,7 +127,7 @@ unless RUBY_PLATFORM =~ /java/
           end
           hydra.queue @request
           hydra.run
-          expect(test_headers).to include('X-Test' => '1')
+          expect(test_headers.to_h).to include('X-Test' => '1')
         end
       end
     end

data/spec/acceptance/typhoeus/typhoeus_hydra_spec_helper.rb

@@ -6,7 +6,7 @@ module TyphoeusHydraSpecHelper
 
 
   def http_request(method, uri, options = {}, &block)
-    uri.gsub!(" ", "%20") #typhoeus doesn't like spaces in the uri
+    uri = uri.gsub(" ", "%20") #typhoeus doesn't like spaces in the uri
     request_options =  {
       method: method,
       body: options[:body],

data/spec/unit/api_spec.rb

@@ -2,9 +2,8 @@ require 'spec_helper'
 
 describe WebMock::API do
   describe '#hash_including' do
-
     subject { klass.new.hash_including(args) }
-    let(:args) { {data: :one} }
+    let(:args) { { data: :one } }
 
     context 'when mixed into a class that does not define `hash_including`' do
       let(:klass) do
@@ -54,7 +53,7 @@ describe WebMock::API do
 
 
     context 'when mixed into a class with a parent that defines `hash_including`' do
-      subject {klass.new.hash_including(*args)}
+      subject { klass.new.hash_including(*args) }
       let(:args) { %w(:foo, :bar, {:data => :one}) }
       let(:klass) do
         Class.new(
@@ -70,6 +69,88 @@ describe WebMock::API do
         expect(subject).to eq(args)
       end
     end
+  end
+
+  describe '#hash_excluding' do
+    subject { klass.new.hash_excluding(args) }
+    let(:args) { { data: :one } }
+
+    context 'when mixed into a class that does not define `hash_including`' do
+      let(:klass) do
+        Class.new do
+          include WebMock::API
+        end
+      end
+
+      it 'uses WebMock::Matchers::HashIncludingMatcher' do
+        expect(subject).to be_a(WebMock::Matchers::HashExcludingMatcher)
+      end
+
+      #  by testing equality for HashIncludingMatcher (which stringifies the passed hash) we are
+      #  testing HashIncludingMatcher.initialize behavior as well
+      context 'when args correspond to an hash' do
+        context 'creates "HashExcludingMatcher"' do
+          it 'equals hash with similar key but different value' do
+            expect(subject).to eq('data' => :two)
+          end
+
+          it 'equals hash with similar value but different key' do
+            expect(subject).to eq('data2' => :one)
+          end
+
+          it 'equals hash with defferent value and key' do
+            expect(subject).to eq('data2' => :two)
+          end
 
+          it 'not equals with similar value and key' do
+            expect(subject).not_to eq('data' => :one)
+          end
+        end
+      end
+
+      context 'when args are one or many keys' do
+        subject { klass.new.hash_excluding(:foo, :bar) }
+        let(:anything) { WebMock::Matchers::AnyArgMatcher.new(nil) }
+
+        it "creates 'HashExcludingMatcher' with keys anythingized" do
+          expect(subject).not_to eq('foo' => anything, 'bar' => anything )
+        end
+      end
+
+      context 'when args are both keys and key/value pairs' do
+        subject { klass.new.hash_excluding(:foo, :bar, data: :one) }
+        let(:anything) { WebMock::Matchers::AnyArgMatcher.new(nil) }
+
+        it 'creates "HashExcludingMatcher" with keys anythingized' do
+          expect(subject).not_to eq('foo' => anything, 'bar' => anything, 'data' => :one)
+        end
+      end
+
+      context 'when args are an empty hash' do
+        subject { klass.new.hash_excluding({}) }
+
+        it 'creates "HashExcludingMatcher" with an empty hash' do
+          expect(subject).to eq({})
+        end
+      end
+    end
+
+    context 'when mixed into a class with a parent that defines `hash_excluding`' do
+      subject { klass.new.hash_excluding(*args) }
+      let(:args) { %w(:foo, :bar, {:data => :one}) }
+      let(:klass) do
+        Class.new(
+          Class.new do
+            def hash_excluding(*args)
+              args
+            end
+          end
+        ) { include WebMock::API }
+      end
+
+      it 'uses super and passes the args untampered' do
+        expect(subject).to eq(args)
+      end
+    end
   end
 end

data/spec/unit/matchers/hash_excluding_matcher_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+module WebMock
+  module Matchers
+    describe HashExcludingMatcher do
+      it 'stringifies the given hash keys' do
+        expect(HashExcludingMatcher.new(a: 1, b: 2)).not_to eq('a' => 1, 'b' => 2)
+      end
+
+      it 'sorts elements in the hash' do
+        expect(HashExcludingMatcher.new(b: 2, a: 1)).not_to eq('a' => 1, 'b' => 2)
+      end
+
+      it 'describes itself properly' do
+        expect(HashExcludingMatcher.new(a: 1).inspect).to eq 'hash_excluding({"a"=>1})'
+      end
+
+      describe 'success' do
+        it 'match with hash with a missing key' do
+          expect(HashExcludingMatcher.new(a: 1)).to eq('b' => 2)
+        end
+
+        it 'match an empty hash with a given key' do
+          expect(HashExcludingMatcher.new(a: 1)).to eq({})
+        end
+
+        it 'match when values are nil but keys are different' do
+          expect(HashExcludingMatcher.new(a: nil)).to eq('b' => nil)
+        end
+
+        describe 'when matching an empty hash' do
+          it 'does not matches against any hash' do
+            expect(HashExcludingMatcher.new({})).to eq(a: 1, b: 2, c: 3)
+          end
+        end
+      end
+
+      describe 'failing' do
+        it 'does not match a hash with a one missing key when one pair is matching' do
+          expect(HashExcludingMatcher.new(a: 1, b: 2)).not_to eq('b' => 2)
+        end
+
+        it 'match a hash with an incorrect value' do
+          expect(HashExcludingMatcher.new(a: 1, b: 2)).not_to eq('a' => 1, 'b' => 3)
+        end
+
+        it 'does not matches the same hash' do
+          expect(HashExcludingMatcher.new('a' => 1, 'b' => 2)).not_to eq('a' => 1, 'b' => 2)
+        end
+
+        it 'does not matches a hash with extra stuff' do
+          expect(HashExcludingMatcher.new(a: 1)).not_to eq('a' => 1, 'b' => 2)
+        end
+
+        it 'does not match a non-hash' do
+          expect(HashExcludingMatcher.new(a: 1)).not_to eq 1
+        end
+      end
+    end
+  end
+end

data/spec/unit/request_execution_verifier_spec.rb

@@ -53,7 +53,7 @@ describe WebMock::RequestExecutionVerifier do
       @verifier.times_executed = 0
       @verifier.expected_times_executed = 2
       expected_text = "The request www.example.com was expected to execute 2 times but it executed 0 times"
-      expected_text << @executed_requests_info
+      expected_text += @executed_requests_info
       expect(@verifier.failure_message).to eq(expected_text)
     end
 
@@ -61,7 +61,7 @@ describe WebMock::RequestExecutionVerifier do
       @verifier.times_executed = 1
       @verifier.expected_times_executed = 1
       expected_text = "The request www.example.com was expected to execute 1 time but it executed 1 time"
-      expected_text << @executed_requests_info
+      expected_text += @executed_requests_info
       expect(@verifier.failure_message).to eq(expected_text)
     end
 
@@ -70,7 +70,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.times_executed = 1
         @verifier.at_least_times_executed = 2
         expected_text = "The request www.example.com was expected to execute at least 2 times but it executed 1 time"
-        expected_text << @executed_requests_info
+        expected_text += @executed_requests_info
         expect(@verifier.failure_message).to eq(expected_text)
       end
 
@@ -78,7 +78,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.times_executed = 2
         @verifier.at_least_times_executed = 3
         expected_text = "The request www.example.com was expected to execute at least 3 times but it executed 2 times"
-        expected_text << @executed_requests_info
+        expected_text += @executed_requests_info
         expect(@verifier.failure_message).to eq(expected_text)
       end
     end
@@ -88,7 +88,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.times_executed = 3
         @verifier.at_most_times_executed = 2
         expected_text = "The request www.example.com was expected to execute at most 2 times but it executed 3 times"
-        expected_text << @executed_requests_info
+        expected_text += @executed_requests_info
         expect(@verifier.failure_message).to eq(expected_text)
       end
 
@@ -96,7 +96,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.times_executed = 2
         @verifier.at_most_times_executed = 1
         expected_text = "The request www.example.com was expected to execute at most 1 time but it executed 2 times"
-        expected_text << @executed_requests_info
+        expected_text += @executed_requests_info
         expect(@verifier.failure_message).to eq(expected_text)
       end
     end
@@ -108,14 +108,14 @@ describe WebMock::RequestExecutionVerifier do
       @verifier.times_executed = 2
       @verifier.expected_times_executed = 2
       expected_text = "The request www.example.com was not expected to execute 2 times but it executed 2 times"
-      expected_text << @executed_requests_info
+      expected_text += @executed_requests_info
       expect(@verifier.failure_message_when_negated).to eq(expected_text)
     end
 
     it "reports failure message when not expected request but it executed" do
       @verifier.times_executed = 1
       expected_text = "The request www.example.com was not expected to execute but it executed 1 time"
-      expected_text << @executed_requests_info
+      expected_text += @executed_requests_info
       expect(@verifier.failure_message_when_negated).to eq(expected_text)
     end
 
@@ -124,7 +124,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.times_executed = 3
         @verifier.at_least_times_executed = 2
         expected_text = "The request www.example.com was not expected to execute at least 2 times but it executed 3 times"
-        expected_text << @executed_requests_info
+        expected_text += @executed_requests_info
         expect(@verifier.failure_message_when_negated).to eq(expected_text)
       end
 
@@ -132,7 +132,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.times_executed = 2
         @verifier.at_least_times_executed = 2
         expected_text = "The request www.example.com was not expected to execute at least 2 times but it executed 2 times"
-        expected_text << @executed_requests_info
+        expected_text += @executed_requests_info
         expect(@verifier.failure_message_when_negated).to eq(expected_text)
       end
     end
@@ -142,7 +142,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.times_executed = 2
         @verifier.at_most_times_executed = 3
         expected_text = "The request www.example.com was not expected to execute at most 3 times but it executed 2 times"
-        expected_text << @executed_requests_info
+        expected_text += @executed_requests_info
         expect(@verifier.failure_message_when_negated).to eq(expected_text)
       end
 
@@ -150,7 +150,7 @@ describe WebMock::RequestExecutionVerifier do
         @verifier.times_executed = 1
         @verifier.at_most_times_executed = 2
         expected_text = "The request www.example.com was not expected to execute at most 2 times but it executed 1 time"
-        expected_text << @executed_requests_info
+        expected_text += @executed_requests_info
         expect(@verifier.failure_message_when_negated).to eq(expected_text)
       end
     end

data/test/shared_test.rb

@@ -41,7 +41,7 @@ module SharedTest
 
   def test_verification_that_expected_request_didnt_occur
     expected_message = "The request GET http://www.example.com/ was expected to execute 1 time but it executed 0 times"
-    expected_message << "\n\nThe following requests were made:\n\nNo requests were made.\n============================================================"
+    expected_message += "\n\nThe following requests were made:\n\nNo requests were made.\n============================================================"
     assert_fail(expected_message) do
       assert_requested(:get, "http://www.example.com")
     end
@@ -49,7 +49,7 @@ module SharedTest
 
   def test_verification_that_expected_stub_didnt_occur
     expected_message = "The request ANY http://www.example.com/ was expected to execute 1 time but it executed 0 times"
-    expected_message << "\n\nThe following requests were made:\n\nNo requests were made.\n============================================================"
+    expected_message += "\n\nThe following requests were made:\n\nNo requests were made.\n============================================================"
     assert_fail(expected_message) do
       assert_requested(@stub_http)
     end
@@ -69,6 +69,19 @@ module SharedTest
       query: hash_including({"a" => ["b", "c"]}))
   end
 
+  def test_verification_that_expected_request_not_occured_with_query_params
+    stub_request(:any, 'http://www.example.com').with(query: hash_including(a: ['b', 'c']))
+    stub_request(:any, 'http://www.example.com').with(query: hash_excluding(a: ['b', 'c']))
+    http_request(:get, 'http://www.example.com/?a[]=b&a[]=c&x=1')
+    assert_not_requested(:get, 'http://www.example.com', query: hash_excluding('a' => ['b', 'c']))
+  end
+
+  def test_verification_that_expected_request_occured_with_excluding_query_params
+    stub_request(:any, 'http://www.example.com').with(query: hash_excluding('a' => ['b', 'c']))
+    http_request(:get, 'http://www.example.com/?a[]=x&a[]=y&x=1')
+    assert_requested(:get, 'http://www.example.com', query: hash_excluding('a' => ['b', 'c']))
+  end
+
   def test_verification_that_non_expected_request_didnt_occur
     expected_message = %r(The request GET http://www.example.com/ was not expected to execute but it executed 1 time\n\nThe following requests were made:\n\nGET http://www.example.com/ with headers .+ was made 1 time\n\n============================================================)
     assert_fail(expected_message) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Bartosz Blimke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2018-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -112,16 +112,16 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -276,6 +276,9 @@ files:
 - lib/webmock/http_lib_adapters/net_http_response.rb
 - lib/webmock/http_lib_adapters/patron_adapter.rb
 - lib/webmock/http_lib_adapters/typhoeus_hydra_adapter.rb
+- lib/webmock/matchers/any_arg_matcher.rb
+- lib/webmock/matchers/hash_argument_matcher.rb
+- lib/webmock/matchers/hash_excluding_matcher.rb
 - lib/webmock/matchers/hash_including_matcher.rb
 - lib/webmock/minitest.rb
 - lib/webmock/rack_response.rb
@@ -349,6 +352,7 @@ files:
 - spec/unit/errors_spec.rb
 - spec/unit/http_lib_adapters/http_lib_adapter_registry_spec.rb
 - spec/unit/http_lib_adapters/http_lib_adapter_spec.rb
+- spec/unit/matchers/hash_excluding_matcher_spec.rb
 - spec/unit/matchers/hash_including_matcher_spec.rb
 - spec/unit/rack_response_spec.rb
 - spec/unit/request_body_diff_spec.rb
@@ -394,7 +398,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: webmock
-rubygems_version: 2.2.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Library for stubbing HTTP requests in Ruby.
@@ -440,6 +444,7 @@ test_files:
 - spec/unit/errors_spec.rb
 - spec/unit/http_lib_adapters/http_lib_adapter_registry_spec.rb
 - spec/unit/http_lib_adapters/http_lib_adapter_spec.rb
+- spec/unit/matchers/hash_excluding_matcher_spec.rb
 - spec/unit/matchers/hash_including_matcher_spec.rb
 - spec/unit/rack_response_spec.rb
 - spec/unit/request_body_diff_spec.rb