Add URI-string support for Net::HTTP.post and Net::HTTP.post_form

Author: kyanagi

lib/net/http.rb

@@ -837,7 +837,7 @@ def HTTP.get_response(uri_or_host, path_or_headers = nil, port = nil, &block)
 
     # Posts data to a host; returns a Net::HTTPResponse object.
     #
-    # Argument +url+ must be a URL;
+    # Argument +url+ must be a URI object or a URI string;
     # argument +data+ must be a string:
     #
     #   _uri = uri.dup
@@ -862,6 +862,7 @@ def HTTP.get_response(uri_or_host, path_or_headers = nil, port = nil, &block)
     # - Net::HTTP#post: convenience method for \HTTP method +POST+.
     #
     def HTTP.post(url, data, header = nil)
+      url = URI(url) if url.is_a?(String)
       start(url.hostname, url.port,
             :use_ssl => url.scheme == 'https' ) {|http|
         http.post(url, data, header)
@@ -870,7 +871,7 @@ def HTTP.post(url, data, header = nil)
 
     # Posts data to a host; returns a Net::HTTPResponse object.
     #
-    # Argument +url+ must be a URI;
+    # Argument +url+ must be a URI object or a URI string;
     # argument +data+ must be a hash:
     #
     #   _uri = uri.dup
@@ -889,6 +890,7 @@ def HTTP.post(url, data, header = nil)
     #   }
     #
     def HTTP.post_form(url, params)
+      url = URI(url) if url.is_a?(String)
       req = Post.new(url)
       req.form_data = params
       req.basic_auth url.user, url.password if url.user

test/net/http/test_http.rb

@@ -515,7 +515,24 @@ def _test_post__no_data(http)
     end
   end
 
-  def test_s_post
+  def test_s_post_with_uri_string
+    url = "http://#{config('host')}:#{config('port')}/?q=a"
+    res = Net::HTTP.post(
+            url,
+            "a=x")
+    assert_equal "application/octet-stream", res["Content-Type"]
+    assert_equal "a=x", res.body
+    assert_equal url, res["X-request-uri"]
+
+    res = Net::HTTP.post(
+              url,
+              "hello world",
+              "Content-Type" => "text/plain; charset=US-ASCII")
+    assert_equal "text/plain; charset=US-ASCII", res["Content-Type"]
+    assert_equal "hello world", res.body
+  end
+
+  def test_s_post_with_uri
     url = "http://#{config('host')}:#{config('port')}/?q=a"
     res = Net::HTTP.post(
             URI.parse(url),
@@ -532,7 +549,34 @@ def test_s_post
     assert_equal "hello world", res.body
   end
 
-  def test_s_post_form
+  def test_s_post_form_with_uri_string
+    url = "http://#{config('host')}:#{config('port')}/"
+    res = Net::HTTP.post_form(
+              url,
+              "a" => "x")
+    assert_equal ["a=x"], res.body.split(/[;&]/).sort
+
+    res = Net::HTTP.post_form(
+              url,
+              "a" => "x",
+              "b" => "y")
+    assert_equal ["a=x", "b=y"], res.body.split(/[;&]/).sort
+
+    res = Net::HTTP.post_form(
+              url,
+              "a" => ["x1", "x2"],
+              "b" => "y")
+    assert_equal url, res['X-request-uri']
+    assert_equal ["a=x1", "a=x2", "b=y"], res.body.split(/[;&]/).sort
+
+    res = Net::HTTP.post_form(
+              url + '?a=x',
+              "b" => "y")
+    assert_equal url + '?a=x', res['X-request-uri']
+    assert_equal ["b=y"], res.body.split(/[;&]/).sort
+  end
+
+  def test_s_post_form_with_uri
     url = "http://#{config('host')}:#{config('port')}/"
     res = Net::HTTP.post_form(
               URI.parse(url),