lib/webmock/webmock.rb in webmock-0.9.1 vs lib/webmock/webmock.rb in webmock-1.0.0

@@ -6,35 +6,39 @@
   end
   
   alias_method :stub_http_request, :stub_request
 
   def request(method, uri)
-    RequestProfile.new(method, uri)
+    RequestPattern.new(method, uri)
   end
 
   def assert_requested(method, uri, options = {}, &block)
     expected_times_executed = options.delete(:times) || 1
-    request = RequestProfile.new(method, uri, options).with(&block)
+    request = RequestPattern.new(method, uri, options).with(&block)
     verifier = RequestExecutionVerifier.new(request, expected_times_executed)
     assertion_failure(verifier.failure_message) unless verifier.matches?
   end
 
   def assert_not_requested(method, uri, options = {}, &block)
-    request = RequestProfile.new(method, uri, options).with(&block)
+    request = RequestPattern.new(method, uri, options).with(&block)
     verifier = RequestExecutionVerifier.new(request, options.delete(:times))
     assertion_failure(verifier.negative_failure_message) unless verifier.does_not_match?
   end
 
   def allow_net_connect!
     Config.instance.allow_net_connect = true
   end
 
-  def disable_net_connect!
+  def disable_net_connect!(options = {})
     Config.instance.allow_net_connect = false
+    Config.instance.allow_localhost = options[:allow_localhost]
   end
 
-  def net_connect_allowed?
-    Config.instance.allow_net_connect
+  def net_connect_allowed?(uri = nil)
+    if uri.class == String
+      uri = URI::parse(uri)
+    end
+    Config.instance.allow_net_connect || ( Config.instance.allow_localhost && uri.is_a?(URI) && uri.host == 'localhost' )
   end
 
   def registered_request?(request_signature)
     RequestRegistry.instance.registered_request?(request_signature)
   end