Merge pull request #263 from bastien/bastien/multiple-regex-in-allow

multiple regex in allow
bblimke · Mar 17, 2013 · d85e2cf · d85e2cf
2 parents 1ee340f + 3122c7f
commit d85e2cf
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/lib/webmock/webmock.rb b/lib/webmock/webmock.rb
@@ -59,18 +59,20 @@ def self.net_connect_allowed?(uri = nil)
     end
 
     Config.instance.allow_net_connect ||
-    (
+    ( Config.instance.allow_localhost && WebMock::Util::URI.is_uri_localhost?(uri) ||
-    Config.instance.allow_localhost && WebMock::Util::URI.is_uri_localhost?(uri)) ||
+      Config.instance.allow && net_connect_explicit_allowed?(Config.instance.allow, uri) )
-    Config.instance.allow && (
+  end
-      (Config.instance.allow.kind_of?(Regexp) && uri.to_s =~ Config.instance.allow) ||
+
-      (
+  def self.net_connect_explicit_allowed?(allowed, uri=nil)
-        Config.instance.allow.respond_to?(:include?) &&
+    case allowed
-        (
+    when Array
-          Config.instance.allow.include?(uri.host) ||
+      allowed.any? { |allowed_item| net_connect_explicit_allowed?(allowed_item, uri) }
-          Config.instance.allow.include?("#{uri.host}:#{uri.port}")
+    when Regexp
-        )
+      uri.to_s =~ allowed
-      )
+    when String
-    )
+      allowed == uri.host ||
+      allowed == "#{uri.host}:#{uri.port}"
+    end
   end
 
   def self.reset!

diff --git a/spec/acceptance/net_http/net_http_spec.rb b/spec/acceptance/net_http/net_http_spec.rb
@@ -203,6 +203,11 @@ class TestMarshalingInWebMockNetHTTP
         response = Net::HTTP.get('www.google.com','/')
       end
 
+      it "should connect to the server if the URI matches any regex the array", :net_connect => true do
+        WebMock.disable_net_connect!(:allow => [/google.com/, /yahoo.com/])
+        response = Net::HTTP.get('www.google.com','/')
+      end
+
     end
 
   end