Split .use_proxy? into 2 dedicated methods

Author: aliismayilov

lib/uri/generic.rb

@@ -1554,7 +1554,7 @@ def find_proxy(env=ENV)
 
       name = 'no_proxy'
       if self.hostname && (no_proxy = env[name] || env[name.upcase])
-        if no_proxy && !URI::Generic.use_proxy?(self.hostname, nil, self.port, no_proxy)
+        if no_proxy && !URI::Generic.hostname_use_proxy?(self.hostname, self.port, no_proxy)
           return nil
         end
 
@@ -1564,13 +1564,13 @@ def find_proxy(env=ENV)
         rescue SocketError
         end
 
-        return nil if no_proxy && !URI::Generic.use_proxy?(self.hostname, addr, self.port, no_proxy)
+        return nil if no_proxy && !URI::Generic.addr_use_proxy?(addr, self.port, no_proxy)
       end
 
       URI.parse(proxy_uri)
     end
 
-    def self.use_proxy?(hostname, addr, port, no_proxy) # :nodoc:
+    def self.hostname_use_proxy?(hostname, port, no_proxy) # :nodoc:
       hostname = hostname.downcase
       dothostname = ".#{hostname}"
       no_proxy.scan(/([^:,\s]+)(?::(\d+))?/) {|p_host, p_port|
@@ -1580,12 +1580,20 @@ def self.use_proxy?(hostname, addr, port, no_proxy) # :nodoc:
           else
             return false if dothostname.end_with?(".#{p_host.downcase}")
           end
-          if addr
-            begin
-              return false if IPAddr.new(p_host).include?(addr)
-            rescue IPAddr::InvalidAddressError
-              next
-            end
+        end
+      }
+      true
+    end
+
+    def self.addr_use_proxy?(addr, port, no_proxy) # :nodoc:
+      return false if addr.nil?
+
+      no_proxy.scan(/([^:,\s]+)(?::(\d+))?/) {|p_host, p_port|
+        if !p_port || port == p_port.to_i
+          begin
+            return false if IPAddr.new(p_host).include?(addr)
+          rescue IPAddr::InvalidAddressError
+            next
           end
         end
       }

test/uri/test_generic.rb

@@ -1034,26 +1034,34 @@ def test_find_proxy_case_sensitive_env
     }
   end
 
-  def test_use_proxy_p
+  def test_hostname_use_proxy_p
     [
-      ['example.com', nil, 80, '', true],
-      ['example.com', nil, 80, 'example.com:80', false],
-      ['example.com', nil, 80, 'example.org,example.com:80,example.net', false],
-      ['foo.example.com', nil, 80, 'example.com', false],
-      ['foo.example.com', nil, 80, '.example.com', false],
-      ['example.com', nil, 80, '.example.com', true],
-      ['xample.com', nil, 80, '.example.com', true],
-      ['fooexample.com', nil, 80, '.example.com', true],
-      ['foo.example.com', nil, 80, 'example.com:80', false],
-      ['foo.eXample.com', nil, 80, 'example.com:80', false],
-      ['foo.example.com', nil, 80, 'eXample.com:80', false],
-      ['foo.example.com', nil, 80, 'example.com:443', true],
-      ['127.0.0.1', '127.0.0.1', 80, '10.224.0.0/22', true],
-      ['10.224.1.1', '10.224.1.1', 80, '10.224.1.1', false],
-      ['10.224.1.1', '10.224.1.1', 80, '10.224.0.0/22', false],
-    ].each do |hostname, addr, port, no_proxy, expected|
-      assert_equal expected, URI::Generic.use_proxy?(hostname, addr, port, no_proxy),
-        "use_proxy?('#{hostname}', '#{addr}', #{port}, '#{no_proxy}')"
+      ['example.com', 80, '', true],
+      ['example.com', 80, 'example.com:80', false],
+      ['example.com', 80, 'example.org,example.com:80,example.net', false],
+      ['foo.example.com', 80, 'example.com', false],
+      ['foo.example.com', 80, '.example.com', false],
+      ['example.com', 80, '.example.com', true],
+      ['xample.com', 80, '.example.com', true],
+      ['fooexample.com', 80, '.example.com', true],
+      ['foo.example.com', 80, 'example.com:80', false],
+      ['foo.eXample.com', 80, 'example.com:80', false],
+      ['foo.example.com', 80, 'eXample.com:80', false],
+      ['foo.example.com', 80, 'example.com:443', true],
+    ].each do |hostname, port, no_proxy, expected|
+      assert_equal expected, URI::Generic.hostname_use_proxy?(hostname, port, no_proxy),
+        "use_proxy?('#{hostname}', #{port}, '#{no_proxy}')"
+    end
+  end
+
+  def test_addr_use_proxy_p
+    [
+      ['127.0.0.1', 80, '10.224.0.0/22', true],
+      ['10.224.1.1', 80, '10.224.1.1', false],
+      ['10.224.1.1', 80, '10.224.0.0/22', false],
+    ].each do |addr, port, no_proxy, expected|
+      assert_equal expected, URI::Generic.addr_use_proxy?(addr, port, no_proxy),
+        "use_proxy?('#{addr}', #{port}, '#{no_proxy}')"
     end
   end