webmock 1.8.6 → 3.14.0

data/lib/webmock/util/json.rb

@@ -1,12 +1,20 @@
 # This is a copy of https://github.com/jnunemaker/crack/blob/master/lib/crack/json.rb
 # with date parsing removed
+# Copyright (c) 2004-2008 David Heinemeier Hansson
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 module WebMock
   module Util
     class JSON
+      class ParseError < StandardError; end
+
       def self.parse(json)
-        YAML.load(unescape(convert_json_to_yaml(json)))
-      rescue ArgumentError
-        raise ParseError, "Invalid JSON string"
+        yaml = unescape(convert_json_to_yaml(json))
+        YAML.load(yaml)
+      rescue ArgumentError => e
+        raise ParseError, "Invalid JSON string: #{yaml}, Error: #{e.inspect}"
       end
 
       protected
@@ -16,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
@@ -37,11 +44,17 @@ module WebMock
           json.gsub(/\\\//, '/')
         else
           left_pos  = [-1].push(*marks)
-          right_pos = marks << json.length
+          right_pos = marks << json.bytesize
           output    = []
+
           left_pos.each_with_index do |left, i|
-            output << json[left.succ..right_pos[i]]
+            if json.respond_to?(:byteslice)
+              output << json.byteslice(left.succ..right_pos[i])
+            else
+              output << json[left.succ..right_pos[i]]
+            end
           end
+
           output = output * " "
 
           times.each { |i| output[i-1] = ' ' }

data/lib/webmock/util/query_mapper.rb

@@ -0,0 +1,281 @@
+module WebMock::Util
+  class QueryMapper
+    class << self
+      #This class is based on Addressable::URI pre 2.3.0
+
+      ##
+      # Converts the query component to a Hash value.
+      #
+      # @option [Symbol] notation
+      #   May be one of <code>:flat</code>, <code>:dot</code>, or
+      #   <code>:subscript</code>. The <code>:dot</code> notation is not
+      #   supported for assignment. Default value is <code>:subscript</code>.
+      #
+      # @return [Hash, Array] The query string parsed as a Hash or Array object.
+      #
+      # @example
+      #   WebMock::Util::QueryMapper.query_to_values("?one=1&two=2&three=3")
+      #   #=> {"one" => "1", "two" => "2", "three" => "3"}
+      #   WebMock::Util::QueryMapper("?one[two][three]=four").query_values
+      #   #=> {"one" => {"two" => {"three" => "four"}}}
+      #   WebMock::Util::QueryMapper.query_to_values("?one.two.three=four",
+      #     :notation => :dot
+      #   )
+      #   #=> {"one" => {"two" => {"three" => "four"}}}
+      #   WebMock::Util::QueryMapper.query_to_values("?one[two][three]=four",
+      #     :notation => :flat
+      #   )
+      #   #=> {"one[two][three]" => "four"}
+      #   WebMock::Util::QueryMapper.query_to_values("?one.two.three=four",
+      #     :notation => :flat
+      #   )
+      #   #=> {"one.two.three" => "four"}
+      #   WebMock::Util::QueryMapper(
+      #     "?one[two][three][]=four&one[two][three][]=five"
+      #   )
+      #   #=> {"one" => {"two" => {"three" => ["four", "five"]}}}
+      #   WebMock::Util::QueryMapper.query_to_values(
+      #     "?one=two&one=three").query_values(:notation => :flat_array)
+      #   #=> [['one', 'two'], ['one', 'three']]
+      def query_to_values(query, options={})
+        return nil if query.nil?
+        query = query.dup.force_encoding('utf-8') if query.respond_to?(:force_encoding)
+
+        options[:notation] ||= :subscript
+
+        if ![:flat, :dot, :subscript, :flat_array].include?(options[:notation])
+          raise ArgumentError,
+                'Invalid notation. Must be one of: ' +
+                '[:flat, :dot, :subscript, :flat_array].'
+        end
+
+        empty_accumulator = :flat_array == options[:notation] ? [] : {}
+
+        query_array = collect_query_parts(query)
+
+        query_hash = collect_query_hash(query_array, empty_accumulator, options)
+
+        normalize_query_hash(query_hash, empty_accumulator, options)
+      end
+
+      def normalize_query_hash(query_hash, empty_accumulator, options)
+        query_hash.inject(empty_accumulator.dup) do |accumulator, (key, value)|
+          if options[:notation] == :flat_array
+            accumulator << [key, value]
+          else
+            accumulator[key] = value.kind_of?(Hash) ? dehash(value) : value
+          end
+          accumulator
+        end
+      end
+
+      def collect_query_parts(query)
+        query_parts = query.split('&').map do |pair|
+          pair.split('=', 2) if pair && !pair.empty?
+        end
+        query_parts.compact
+      end
+
+      def collect_query_hash(query_array, empty_accumulator, options)
+        query_array.compact.inject(empty_accumulator.dup) do |accumulator, (key, value)|
+          value = if value.nil?
+                    nil
+                  else
+                    ::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)
+          self.__send__("fill_accumulator_for_#{options[:notation]}", accumulator, key, value)
+          accumulator
+        end
+      end
+
+      def fill_accumulator_for_flat(accumulator, key, value)
+        if accumulator[key]
+          raise ArgumentError, "Key was repeated: #{key.inspect}"
+        end
+        accumulator[key] = value
+      end
+
+      def fill_accumulator_for_flat_array(accumulator, key, value)
+        accumulator << [key, value]
+      end
+
+      def fill_accumulator_for_dot(accumulator, key, value)
+        array_value = false
+        subkeys = key.split(".")
+        current_hash = accumulator
+        subkeys[0..-2].each do |subkey|
+          current_hash[subkey] = {} unless current_hash[subkey]
+          current_hash = current_hash[subkey]
+        end
+        if array_value
+          if current_hash[subkeys.last] && !current_hash[subkeys.last].is_a?(Array)
+            current_hash[subkeys.last] = [current_hash[subkeys.last]]
+          end
+          current_hash[subkeys.last] = [] unless current_hash[subkeys.last]
+          current_hash[subkeys.last] << value
+        else
+          current_hash[subkeys.last] = value
+        end
+      end
+
+      def fill_accumulator_for_subscript(accumulator, key, value)
+        current_node = accumulator
+        subkeys = key.split(/(?=\[[^\[\]]+)/)
+        subkeys[0..-2].each do |subkey|
+          node = subkey =~ /\[\]\z/ ? [] : {}
+          subkey = subkey.gsub(/[\[\]]/, '')
+          if current_node.is_a? Array
+            container = current_node.find { |n| n.is_a?(Hash) && n.has_key?(subkey) }
+            if container
+              current_node = container[subkey]
+            else
+              current_node << {subkey => node}
+              current_node = node
+            end
+          else
+            current_node[subkey] = node unless current_node[subkey]
+            current_node = current_node[subkey]
+          end
+        end
+        last_key = subkeys.last
+        array_value = !!(last_key =~ /\[\]$/)
+        last_key = last_key.gsub(/[\[\]]/, '')
+        if current_node.is_a? Array
+          last_container = current_node.select { |n| n.is_a?(Hash) }.last
+          if last_container && !last_container.has_key?(last_key)
+            if array_value
+              last_container[last_key] ||= []
+              last_container[last_key] << value
+            else
+              last_container[last_key] = value
+            end
+          else
+            if array_value
+              current_node << {last_key => [value]}
+            else
+              current_node << {last_key => value}
+            end
+          end
+        else
+          if array_value
+            current_node[last_key] ||= []
+            current_node[last_key] << value unless value.nil?
+          else
+            current_node[last_key] = value
+          end
+        end
+      end
+
+      ##
+      # Sets the query component for this URI from a Hash object.
+      # This method produces a query string using the :subscript notation.
+      # An empty Hash will result in a nil query.
+      #
+      # @param [Hash, #to_hash, Array] new_query_values The new query values.
+      def values_to_query(new_query_values, options = {})
+        options[:notation] ||= :subscript
+        return if new_query_values.nil?
+
+        unless new_query_values.is_a?(Array)
+          unless new_query_values.respond_to?(:to_hash)
+            raise TypeError,
+                  "Can't convert #{new_query_values.class} into Hash."
+          end
+          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) && 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]}
+            else
+              object << [key.to_s, value]
+            end
+            object
+          end
+          # Useful default for OAuth and caching.
+          # Only to be used for non-Array inputs. Arrays should preserve order.
+          begin
+            new_query_values.sort! # may raise for non-comparable values
+          rescue NoMethodError, ArgumentError
+            # ignore
+          end
+        end
+
+        buffer = ''.dup
+        new_query_values.each do |parent, value|
+          encoded_parent = ::Addressable::URI.encode_component(
+              parent.dup, ::Addressable::URI::CharacterClasses::UNRESERVED
+          )
+          buffer << "#{to_query(encoded_parent, value, options)}&"
+        end
+        buffer.chop
+      end
+
+      def dehash(hash)
+        hash.each do |(key, value)|
+          if value.is_a?(::Hash)
+            hash[key] = self.dehash(value)
+          end
+        end
+        if hash != {} && hash.keys.all? { |key| key =~ /^\d+$/ }
+          hash.sort.inject([]) do |accu, (_, value)|
+            accu << value; accu
+          end
+        else
+          hash
+        end
+      end
+
+      ##
+      # Joins and converts parent and value into a properly encoded and
+      # ordered URL query.
+      #
+      # @private
+      # @param [String] parent an URI encoded component.
+      # @param [Array, Hash, Symbol, #to_str] value
+      #
+      # @return [String] a properly escaped and ordered URL query.
+
+      # new_query_values have form [['key1', 'value1'], ['key2', 'value2']]
+      def to_query(parent, value, options = {})
+        options[:notation] ||= :subscript
+        case value
+        when ::Hash
+          value = value.map do |key, val|
+            [
+              ::Addressable::URI.encode_component(key.to_s.dup, ::Addressable::URI::CharacterClasses::UNRESERVED),
+              val
+            ]
+          end
+          value.sort!
+          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 = ''.dup
+          value.each_with_index do |val, i|
+            new_parent = options[:notation] != :flat_array ? "#{parent}[#{i}]" : parent
+            buffer << "#{to_query(new_parent, val, options)}&"
+          end
+          buffer.chop
+        when NilClass
+          parent
+        else
+          encoded_value = Addressable::URI.encode_component(
+            value.to_s.dup, Addressable::URI::CharacterClasses::UNRESERVED
+          )
+          "#{parent}=#{encoded_value}"
+        end
+      end
+    end
+
+  end
+end

data/lib/webmock/util/uri.rb

@@ -1,24 +1,24 @@
-module Addressable
-  class URI
-    module CharacterClasses
-      USERINFO = UNRESERVED + SUB_DELIMS + "\\:"
-    end
-  end
-end
-
 module WebMock
 
   module Util
 
     class URI
+      module CharacterClasses
+        USERINFO = Addressable::URI::CharacterClasses::UNRESERVED + Addressable::URI::CharacterClasses::SUB_DELIMS + "\\:"
+      end
+
       ADDRESSABLE_URIS = Hash.new do |hash, key|
         hash[key] = Addressable::URI.heuristic_parse(key)
       end
 
       NORMALIZED_URIS = Hash.new do |hash, uri|
         normalized_uri = WebMock::Util::URI.heuristic_parse(uri)
-        normalized_uri.query_values = sort_query_values(normalized_uri.query_values) if normalized_uri.query_values
+        if normalized_uri.query_values
+          sorted_query_values = sort_query_values(WebMock::Util::QueryMapper.query_to_values(normalized_uri.query, notation: Config.instance.query_values_notation) || {})
+          normalized_uri.query = WebMock::Util::QueryMapper.values_to_query(sorted_query_values, notation: WebMock::Config.instance.query_values_notation)
+        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
@@ -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
 
@@ -63,7 +63,7 @@ module WebMock
       end
 
       def self.encode_unsafe_chars_in_userinfo(userinfo)
-        Addressable::URI.encode_component(userinfo, Addressable::URI::CharacterClasses::USERINFO)
+        Addressable::URI.encode_component(userinfo, WebMock::Util::URI::CharacterClasses::USERINFO)
       end
 
       def self.is_uri_localhost?(uri)
@@ -74,25 +74,35 @@ module WebMock
       private
 
       def self.sort_query_values(query_values)
-        Hash[*query_values.sort.inject([]) { |values, pair| values + pair}]
+        sorted_query_values = query_values.sort
+        query_values.is_a?(Hash) ? Hash[*sorted_query_values.inject([]) { |values, pair| values + pair}] : sorted_query_values
       end
 
       def self.uris_with_inferred_port_and_without(uris)
-        uris.map { |uri| [ uri, uri.gsub(%r{(:80)|(:443)}, "").freeze ] }.flatten
+        uris.map { |uri|
+          [ 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.gsub(%r{^https?://},"").freeze ] }.flatten
+        uris.map { |uri|
+          [ uri, uri.gsub(%r{^https?://},"").freeze ]
+        }.flatten
       end
 
       def self.uris_with_trailing_slash_and_without(uris)
-        uris = uris.map { |uri| [ uri, uri.omit(:path).freeze ] }.flatten
+        uris.map { |uri|
+          [ uri, uri.omit(:path).freeze ]
+        }.flatten
       end
 
     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/util/version_checker.rb

@@ -1,15 +1,41 @@
 # This code was created based on https://github.com/myronmarston/vcr/blob/master/lib/vcr/util/version_checker.rb
 # Thanks to @myronmarston
 
+# Copyright (c) 2010-2012 Myron Marston
+
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 module WebMock
   class VersionChecker
-    def initialize(library_name, library_version, min_patch_level, max_minor_version = nil)
+    def initialize(library_name, library_version, min_patch_level, max_minor_version = nil, unsupported_versions = [])
       @library_name, @library_version = library_name, library_version
       @min_patch_level, @max_minor_version = min_patch_level, max_minor_version
+      @unsupported_versions = unsupported_versions || []
 
       @major,     @minor,     @patch     = parse_version(library_version)
       @min_major, @min_minor, @min_patch = parse_version(min_patch_level)
-      @max_major, @max_minor             = parse_version(max_minor_version) if max_minor_version
+      if max_minor_version
+        @max_major, @max_minor           = parse_version(max_minor_version)
+      else
+        @max_major, @max_minor           = nil, nil
+      end
 
       @comparison_result = compare_version
     end
@@ -17,6 +43,7 @@ module WebMock
     def check_version!
       warn_about_too_low if too_low?
       warn_about_too_high if too_high?
+      warn_about_unsupported_version if unsupported_version?
     end
 
   private
@@ -29,6 +56,10 @@ module WebMock
       @comparison_result == :too_high
     end
 
+    def unsupported_version?
+      @unsupported_versions.include?(@library_version)
+    end
+
     def warn_about_too_low
       warn_in_red "You are using #{@library_name} #{@library_version}. " +
                   "WebMock supports version #{version_requirement}."
@@ -40,6 +71,12 @@ module WebMock
                   "It may not work with this version."
     end
 
+    def warn_about_unsupported_version
+      warn_in_red "You are using #{@library_name} #{@library_version}. " +
+                  "WebMock does not support this version. " +
+                  "WebMock supports versions #{version_requirement}."
+    end
+
     def warn_in_red(text)
       Kernel.warn colorize(text, "\e[31m")
     end
@@ -59,6 +96,7 @@ module WebMock
     def version_requirement
       req = ">= #{@min_patch_level}"
       req += ", < #{@max_major}.#{@max_minor + 1}" if @max_minor
+      req += ", except versions #{@unsupported_versions.join(',')}" unless @unsupported_versions.empty?
       req
     end
 

data/lib/webmock/version.rb

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

data/lib/webmock/webmock.rb

@@ -53,24 +53,65 @@ 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_localhost && WebMock::Util::URI.is_uri_localhost?(uri)) ||
-    Config.instance.allow && (
-      (Config.instance.allow.kind_of?(Regexp) && uri.to_s =~ Config.instance.allow) ||
-      (
-        Config.instance.allow.respond_to?(:include?) &&
-        (
-          Config.instance.allow.include?(uri.host) ||
-          Config.instance.allow.include?("#{uri.host}:#{uri.port}")
-        )
-      )
-    )
+    !!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_connect_explicit_allowed?(allowed, uri=nil)
+    case allowed
+    when Array
+      allowed.any? { |allowed_item| net_connect_explicit_allowed?(allowed_item, uri) }
+    when Regexp
+      (uri.to_s =~ allowed) != nil ||
+      (uri.omit(:port).to_s =~ allowed) != nil && uri.port == uri.default_port
+    when String
+      allowed == uri.to_s ||
+      allowed == uri.host ||
+      allowed == "#{uri.host}:#{uri.port}" ||
+      allowed == "#{uri.scheme}://#{uri.host}:#{uri.port}" ||
+      allowed == "#{uri.scheme}://#{uri.host}" && uri.port == uri.default_port
+    else
+      if allowed.respond_to?(:call)
+        allowed.call(uri)
+      end
+    end
+  end
+
+  def self.show_body_diff!
+    Config.instance.show_body_diff = true
+  end
+
+  def self.hide_body_diff!
+    Config.instance.show_body_diff = false
+  end
+
+  def self.show_body_diff?
+    Config.instance.show_body_diff
+  end
+
+  def self.hide_stubbing_instructions!
+    Config.instance.show_stubbing_instructions = false
+  end
+
+  def self.show_stubbing_instructions!
+    Config.instance.show_stubbing_instructions = true
+  end
+
+  def self.show_stubbing_instructions?
+    Config.instance.show_stubbing_instructions
   end
 
   def self.reset!
@@ -99,8 +140,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(
@@ -119,6 +160,4 @@ module WebMock
                           end
     ))
   end
-
-  self.enable!
 end