Net::HTTP.get_response can receive URI as string

Author: kyanagi

lib/net/http.rb

@@ -61,8 +61,7 @@ class HTTPHeaderSyntaxError < StandardError; end
   #
   # === GET by URI
   #
-  #   uri = URI('http://example.com/index.html?count=10')
-  #   Net::HTTP.get(uri) # => String
+  #   Net::HTTP.get('http://example.com/index.html?count=10') # => String
   #
   # === GET with Dynamic Parameters
   #
@@ -117,8 +116,7 @@ class HTTPHeaderSyntaxError < StandardError; end
   #
   # === Response Data
   #
-  #   uri = URI('http://example.com/index.html')
-  #   res = Net::HTTP.get_response(uri)
+  #   res = Net::HTTP.get_response('http://example.com/index.html')
   #
   #   # Headers
   #   res['Set-Cookie']            # => String
@@ -150,7 +148,7 @@ class HTTPHeaderSyntaxError < StandardError; end
   #     # You should choose a better exception.
   #     raise ArgumentError, 'too many HTTP redirects' if limit == 0
   #
-  #     response = Net::HTTP.get_response(URI(uri_str))
+  #     response = Net::HTTP.get_response(uri_str)
   #
   #     case response
   #     when Net::HTTPSuccess then
@@ -261,12 +259,11 @@ class HTTPHeaderSyntaxError < StandardError; end
   #     response = http.request request # Net::HTTPResponse object
   #   end
   #
-  # Or if you simply want to make a GET request, you may pass in an URI
-  # object that has an HTTPS URL. Net::HTTP automatically turns on TLS
-  # verification if the URI object has a 'https' URI scheme.
+  # Or if you simply want to make a GET request, you may pass in a HTTPS URL.
+  # Net::HTTP automatically turns on TLS verification if the URL has a 'https'
+  # scheme.
   #
-  #   uri = URI('https://example.com/')
-  #   Net::HTTP.get(uri) # => String
+  #   Net::HTTP.get('https://example.com/') # => String
   #
   # In previous versions of Ruby you would need to require 'net/https' to use
   # HTTPS. This is no longer true.
@@ -452,7 +449,7 @@ def HTTP.get_print(uri_or_host, path_or_headers = nil, port = nil)
     # as a string.  The target can either be specified as
     # (+uri+, +headers+), or as (+host+, +path+, +port+ = 80); so:
     #
-    #    print Net::HTTP.get(URI('http://www.example.com/index.html'))
+    #    print Net::HTTP.get('http://www.example.com/index.html')
     #
     # or:
     #
@@ -470,7 +467,7 @@ def HTTP.get(uri_or_host, path_or_headers = nil, port = nil)
     # as a Net::HTTPResponse object.  The target can either be specified as
     # (+uri+, +headers+), or as (+host+, +path+, +port+ = 80); so:
     #
-    #    res = Net::HTTP.get_response(URI('http://www.example.com/index.html'))
+    #    res = Net::HTTP.get_response('http://www.example.com/index.html')
     #    print res.body
     #
     # or:
@@ -480,7 +477,7 @@ def HTTP.get(uri_or_host, path_or_headers = nil, port = nil)
     #
     # you can also specify request headers:
     #
-    #    Net::HTTP.get_response(URI('http://www.example.com/index.html'), { 'Accept' => 'text/html' })
+    #    Net::HTTP.get_response('http://www.example.com/index.html', { 'Accept' => 'text/html' })
     #
     def HTTP.get_response(uri_or_host, path_or_headers = nil, port = nil, &block)
       if path_or_headers && !path_or_headers.is_a?(Hash)
@@ -491,6 +488,7 @@ def HTTP.get_response(uri_or_host, path_or_headers = nil, port = nil, &block)
         }
       else
         uri = uri_or_host
+        uri = URI(uri) if uri.is_a?(String)
         headers = path_or_headers
         start(uri.hostname, uri.port,
               :use_ssl => uri.scheme == 'https') {|http|

test/net/http/test_http.rb

@@ -301,6 +301,13 @@ def test_s_get
     assert_equal $test_net_http_data,
         Net::HTTP.get(config('host'), '/', config('port'))
 
+    assert_equal $test_net_http_data,
+        Net::HTTP.get("http://#{config('host')}:#{config('port')}")
+
+    assert_equal $test_net_http_data, Net::HTTP.get(
+      "http://#{config('host')}:#{config('port')}", "Accept" => "text/plain"
+    )
+
     assert_equal $test_net_http_data, Net::HTTP.get(
       URI.parse("http://#{config('host')}:#{config('port')}")
     )
@@ -309,7 +316,23 @@ def test_s_get
     )
   end
 
-  def test_s_get_response
+  def test_s_get_response_with_host
+    res = Net::HTTP.get_response(config('host'), '/', config('port'))
+    assert_equal "application/octet-stream", res["Content-Type"]
+    assert_equal $test_net_http_data, res.body
+  end
+
+  def test_s_get_response_with_uri_string
+    res = Net::HTTP.get_response("http://#{config('host')}:#{config('port')}")
+    assert_equal "application/octet-stream", res["Content-Type"]
+    assert_equal $test_net_http_data, res.body
+
+    res = Net::HTTP.get_response("http://#{config('host')}:#{config('port')}", "Accept" => "text/plain")
+    assert_equal "text/plain", res["Content-Type"]
+    assert_equal $test_net_http_data, res.body
+  end
+
+  def test_s_get_response_with_uri
     res = Net::HTTP.get_response(
       URI.parse("http://#{config('host')}:#{config('port')}")
     )