webmock 3.0.1 → 3.18.1

data/lib/webmock/stub_request_snippet.rb

@@ -10,23 +10,27 @@ 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}"
+        with << "\n    body: #{request_pattern.body_pattern.to_s}"
       end
 
       if (request_pattern.headers_pattern)
-        with << ",\n       " unless with.empty?
+        with << "," unless with.empty?
 
-        with << "headers: #{request_pattern.headers_pattern.to_s}"
+        with << "\n    headers: #{request_pattern.headers_pattern.pp_to_s}"
       end
       string << ".\n  with(#{with})" unless with.empty?
       if with_response
-        string << ".\n  to_return(status: 200, body: \"\", headers: {})"
+        if request_pattern.headers_pattern && request_pattern.headers_pattern.matches?({ 'Accept' => "application/json" })
+          string << ".\n  to_return(status: 200, body: \"{}\", headers: {})"
+        else
+          string << ".\n  to_return(status: 200, body: \"\", headers: {})"
+        end
       end
       string
     end

data/lib/webmock/test_unit.rb

@@ -8,12 +8,10 @@ module Test
     class TestCase
       include WebMock::API
 
-      alias_method :teardown_without_webmock, :teardown
+      teardown
       def teardown_with_webmock
-        teardown_without_webmock
         WebMock.reset!
       end
-      alias_method :teardown, :teardown_with_webmock
 
     end
   end

data/lib/webmock/util/hash_counter.rb

@@ -2,7 +2,7 @@ require 'thread'
 
 module WebMock
   module Util
-    class Util::HashCounter
+    class HashCounter
       attr_accessor :hash
       def initialize
         self.hash = {}
@@ -30,8 +30,8 @@ module WebMock
       end
 
       def each(&block)
-        @order.to_a.sort {|a, b| a[1] <=> b[1]}.each do |a|
-          block.call(a[0], hash[a[0]])
+        @order.to_a.sort_by { |a| a[1] }.each do |a|
+          yield(a[0], hash[a[0]])
         end
       end
     end

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
@@ -34,6 +34,21 @@ module WebMock
         str << '}'
       end
 
+      def self.pp_headers_string(headers)
+        headers = WebMock::Util::Headers.normalize_headers(headers)
+        seperator = "\n\t "
+        str = "{#{seperator} ".dup
+        str << headers.map do |k,v|
+          v = case v
+            when Regexp then v.inspect
+            when Array then "["+v.map{|w| "'#{w.to_s}'"}.join(", ")+"]"
+            else "'#{v.to_s}'"
+          end
+          "'#{k}'=>#{v}"
+        end.sort.join(",#{seperator} ")
+        str << "\n    }"
+      end
+
       def self.decode_userinfo_from_header(header)
         header.sub(/^Basic /, "").unpack("m").first
       end

data/lib/webmock/util/json.rb

@@ -24,13 +24,12 @@ module WebMock
 
       # Ensure that ":" and "," are always followed by a space
       def self.convert_json_to_yaml(json) #:nodoc:
-        scanner, quoting, marks, pos, times = StringScanner.new(json), false, [], nil, []
+        scanner, quoting, marks, times = StringScanner.new(json), false, [], []
         while scanner.scan_until(/(\\['"]|['":,\\]|\\.)/)
           case char = scanner[1]
           when '"', "'"
             if !quoting
               quoting = char
-              pos = scanner.pos
             elsif quoting == char
               quoting = false
             end

data/lib/webmock/util/query_mapper.rb

@@ -81,7 +81,7 @@ module WebMock::Util
           value = if value.nil?
                     nil
                   else
-                    ::Addressable::URI.unencode_component(value.gsub(/\+/, ' '))
+                    ::Addressable::URI.unencode_component(value.tr('+', ' '))
                   end
           key = Addressable::URI.unencode_component(key)
           key = key.dup.force_encoding(Encoding::ASCII_8BIT) if key.respond_to?(:force_encoding)
@@ -122,7 +122,7 @@ module WebMock::Util
 
       def fill_accumulator_for_subscript(accumulator, key, value)
         current_node = accumulator
-        subkeys = key.split(/(?=\[\w)/)
+        subkeys = key.split(/(?=\[[^\[\]]+)/)
         subkeys[0..-2].each do |subkey|
           node = subkey =~ /\[\]\z/ ? [] : {}
           subkey = subkey.gsub(/[\[\]]/, '')
@@ -161,7 +161,7 @@ module WebMock::Util
         else
           if array_value
             current_node[last_key] ||= []
-            current_node[last_key] << value
+            current_node[last_key] << value unless value.nil?
           else
             current_node[last_key] = value
           end
@@ -186,7 +186,9 @@ module WebMock::Util
           new_query_values = new_query_values.to_hash
           new_query_values = new_query_values.inject([]) do |object, (key, value)|
             key = key.to_s if key.is_a?(::Symbol) || key.nil?
-            if value.is_a?(Array)
+            if value.is_a?(Array) && value.empty?
+              object << [key.to_s + '[]']
+            elsif value.is_a?(Array)
               value.each { |v| object << [key.to_s + '[]', v] }
             elsif value.is_a?(Hash)
               value.each { |k, v| object << ["#{key.to_s}[#{k}]", v]}
@@ -204,7 +206,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 +253,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/util/uri.rb

@@ -33,7 +33,7 @@ module WebMock
         NORMALIZED_URIS[uri].dup
       end
 
-      def self.variations_of_uri_as_strings(uri_object)
+      def self.variations_of_uri_as_strings(uri_object, only_with_scheme: false)
         normalized_uri = normalize_uri(uri_object.dup).freeze
         uris = [ normalized_uri ]
 
@@ -41,13 +41,13 @@ module WebMock
           uris = uris_with_trailing_slash_and_without(uris)
         end
 
-        uris = uris_encoded_and_unencoded(uris)
-
         if normalized_uri.port == Addressable::URI.port_mapping[normalized_uri.scheme]
           uris = uris_with_inferred_port_and_without(uris)
         end
 
-        if normalized_uri.scheme == "http"
+        uris = uris_encoded_and_unencoded(uris)
+
+        if normalized_uri.scheme == "http" && !only_with_scheme
           uris = uris_with_scheme_and_without(uris)
         end
 
@@ -80,27 +80,27 @@ module WebMock
 
       def self.uris_with_inferred_port_and_without(uris)
         uris.map { |uri|
-          uri = uri.dup.force_encoding(Encoding::ASCII_8BIT) if uri.respond_to?(:force_encoding)
-          [ uri, uri.gsub(%r{(:80)|(:443)}, "").freeze ]
+          [ uri, uri.omit(:port)]
         }.flatten
       end
 
       def self.uris_encoded_and_unencoded(uris)
         uris.map do |uri|
-          [ uri.to_s, Addressable::URI.unencode(uri, String).freeze ]
+          [
+            uri.to_s.force_encoding(Encoding::ASCII_8BIT),
+            Addressable::URI.unencode(uri, String).force_encoding(Encoding::ASCII_8BIT).freeze
+          ]
         end.flatten
       end
 
       def self.uris_with_scheme_and_without(uris)
         uris.map { |uri|
-          uri = uri.dup.force_encoding(Encoding::ASCII_8BIT) if uri.respond_to?(:force_encoding)
           [ uri, uri.gsub(%r{^https?://},"").freeze ]
         }.flatten
       end
 
       def self.uris_with_trailing_slash_and_without(uris)
-        uris = uris.map { |uri|
-          uri = uri.dup.force_encoding(Encoding::ASCII_8BIT) if uri.respond_to?(:force_encoding)
+        uris.map { |uri|
           [ uri, uri.omit(:path).freeze ]
         }.flatten
       end

data/lib/webmock/util/values_stringifier.rb

@@ -0,0 +1,20 @@
+class WebMock::Util::ValuesStringifier
+  def self.stringify_values(value)
+    case value
+    when String, Numeric, TrueClass, FalseClass
+      value.to_s
+    when Hash
+      Hash[
+        value.map do |k, v|
+          [k, stringify_values(v)]
+        end
+      ]
+    when Array
+      value.map do |v|
+        stringify_values(v)
+      end
+    else
+      value
+    end
+  end
+end

data/lib/webmock/version.rb

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

data/lib/webmock/webmock.rb

@@ -53,16 +53,33 @@ module WebMock
     Config.instance.net_http_connect_on_start = options[:net_http_connect_on_start]
   end
 
+  class << self
+    alias :enable_net_connect!   :allow_net_connect!
+    alias :disallow_net_connect! :disable_net_connect!
+  end
+
   def self.net_connect_allowed?(uri = nil)
+    return !!Config.instance.allow_net_connect if uri.nil?
+
     if uri.is_a?(String)
       uri = WebMock::Util::URI.normalize_uri(uri)
     end
 
-    Config.instance.allow_net_connect ||
+    !!Config.instance.allow_net_connect ||
     ( Config.instance.allow_localhost && WebMock::Util::URI.is_uri_localhost?(uri) ||
       Config.instance.allow && net_connect_explicit_allowed?(Config.instance.allow, uri) )
   end
 
+  def self.net_http_connect_on_start?(uri)
+    allowed = Config.instance.net_http_connect_on_start || false
+
+    if [true, false].include?(allowed)
+      allowed
+    else
+      net_connect_explicit_allowed?(allowed, uri)
+    end
+  end
+
   def self.net_connect_explicit_allowed?(allowed, uri=nil)
     case allowed
     when Array
@@ -133,8 +150,8 @@ module WebMock
     puts WebMock::RequestExecutionVerifier.executed_requests_message
   end
 
-  def self.globally_stub_request(&block)
-    WebMock::StubRegistry.instance.register_global_stub(&block)
+  def self.globally_stub_request(order = :before_local_stubs, &block)
+    WebMock::StubRegistry.instance.register_global_stub(order, &block)
   end
 
   %w(

data/lib/webmock.rb

@@ -4,51 +4,56 @@ require 'addressable/uri'
 require 'addressable/template'
 require 'crack/xml'
 
-require 'webmock/deprecation'
-require 'webmock/version'
-
-require 'webmock/errors'
-
-require 'webmock/util/query_mapper'
-require 'webmock/util/uri'
-require 'webmock/util/headers'
-require 'webmock/util/hash_counter'
-require 'webmock/util/hash_keys_stringifier'
-require 'webmock/util/json'
-require 'webmock/util/version_checker'
-require 'webmock/util/hash_validator'
-
-require 'webmock/matchers/hash_including_matcher'
-
-require 'webmock/request_pattern'
-require 'webmock/request_signature'
-require 'webmock/responses_sequence'
-require 'webmock/request_stub'
-require 'webmock/response'
-require 'webmock/rack_response'
-
-require 'webmock/stub_request_snippet'
-require 'webmock/request_signature_snippet'
-require 'webmock/request_body_diff'
-
-require 'webmock/assertion_failure'
-require 'webmock/request_execution_verifier'
-require 'webmock/config'
-require 'webmock/callback_registry'
-require 'webmock/request_registry'
-require 'webmock/stub_registry'
-require 'webmock/api'
-
-require 'webmock/http_lib_adapters/http_lib_adapter_registry'
-require 'webmock/http_lib_adapters/http_lib_adapter'
-require 'webmock/http_lib_adapters/net_http'
-require 'webmock/http_lib_adapters/http_rb_adapter'
-require 'webmock/http_lib_adapters/httpclient_adapter'
-require 'webmock/http_lib_adapters/patron_adapter'
-require 'webmock/http_lib_adapters/curb_adapter'
-require 'webmock/http_lib_adapters/em_http_request_adapter'
-require 'webmock/http_lib_adapters/typhoeus_hydra_adapter'
-require 'webmock/http_lib_adapters/excon_adapter'
-require 'webmock/http_lib_adapters/manticore_adapter'
-
-require 'webmock/webmock'
+require_relative 'webmock/deprecation'
+require_relative 'webmock/version'
+
+require_relative 'webmock/errors'
+
+require_relative 'webmock/util/query_mapper'
+require_relative 'webmock/util/uri'
+require_relative 'webmock/util/headers'
+require_relative 'webmock/util/hash_counter'
+require_relative 'webmock/util/hash_keys_stringifier'
+require_relative 'webmock/util/values_stringifier'
+require_relative 'webmock/util/json'
+require_relative 'webmock/util/version_checker'
+require_relative 'webmock/util/hash_validator'
+
+require_relative 'webmock/matchers/hash_argument_matcher'
+require_relative 'webmock/matchers/hash_excluding_matcher'
+require_relative 'webmock/matchers/hash_including_matcher'
+require_relative 'webmock/matchers/any_arg_matcher'
+
+require_relative 'webmock/request_pattern'
+require_relative 'webmock/request_signature'
+require_relative 'webmock/responses_sequence'
+require_relative 'webmock/request_stub'
+require_relative 'webmock/response'
+require_relative 'webmock/rack_response'
+
+require_relative 'webmock/stub_request_snippet'
+require_relative 'webmock/request_signature_snippet'
+require_relative 'webmock/request_body_diff'
+
+require_relative 'webmock/assertion_failure'
+require_relative 'webmock/request_execution_verifier'
+require_relative 'webmock/config'
+require_relative 'webmock/callback_registry'
+require_relative 'webmock/request_registry'
+require_relative 'webmock/stub_registry'
+require_relative 'webmock/api'
+
+require_relative 'webmock/http_lib_adapters/http_lib_adapter_registry'
+require_relative 'webmock/http_lib_adapters/http_lib_adapter'
+require_relative 'webmock/http_lib_adapters/net_http'
+require_relative 'webmock/http_lib_adapters/http_rb_adapter'
+require_relative 'webmock/http_lib_adapters/httpclient_adapter'
+require_relative 'webmock/http_lib_adapters/patron_adapter'
+require_relative 'webmock/http_lib_adapters/curb_adapter'
+require_relative 'webmock/http_lib_adapters/em_http_request_adapter'
+require_relative 'webmock/http_lib_adapters/typhoeus_hydra_adapter'
+require_relative 'webmock/http_lib_adapters/excon_adapter'
+require_relative 'webmock/http_lib_adapters/manticore_adapter'
+require_relative 'webmock/http_lib_adapters/async_http_client_adapter'
+
+require_relative 'webmock/webmock'

data/minitest/webmock_spec.rb

@@ -20,7 +20,7 @@ require File.expand_path(File.dirname(__FILE__) + '/test_helper')
     end
 
     it "should raise error on non stubbed request" do
-      lambda { http_request(:get, "http://www.example.net/") }.must_raise(WebMock::NetConnectNotAllowedError)
+      expect { http_request(:get, "http://www.example.net/") }.must_raise(WebMock::NetConnectNotAllowedError)
     end
 
     it "should verify that expected request occured" do
@@ -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