Skip to content

Allow a URL String for shorthand methods #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow a URL String for shorthand methods #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions lib/net/http.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ def HTTP.get_response(uri_or_host, path_or_headers = nil, port = nil, &block)
return http.request_get(path, &block)
}
else
uri = uri_or_host
uri = URI(uri_or_host)
headers = path_or_headers
start(uri.hostname, uri.port,
:use_ssl => uri.scheme == 'https') {|http|
Expand All @@ -830,7 +830,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;
# argument +data+ must be a string:
#
# _uri = uri.dup
Expand All @@ -855,6 +855,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)
start(url.hostname, url.port,
:use_ssl => url.scheme == 'https' ) {|http|
http.post(url, data, header)
Expand Down Expand Up @@ -882,6 +883,7 @@ def HTTP.post(url, data, header = nil)
# }
#
def HTTP.post_form(url, params)
url = URI(url)
req = Post.new(url)
req.form_data = params
req.basic_auth url.user, url.password if url.user
Expand All @@ -893,7 +895,7 @@ def HTTP.post_form(url, params)

# Sends a PUT request to the server; returns a Net::HTTPResponse object.
#
# Argument +url+ must be a URL;
# Argument +url+ must be a URI;
# argument +data+ must be a string:
#
# _uri = uri.dup
Expand All @@ -918,6 +920,7 @@ def HTTP.post_form(url, params)
# - Net::HTTP#put: convenience method for \HTTP method +PUT+.
#
def HTTP.put(url, data, header = nil)
url = URI(url)
start(url.hostname, url.port,
:use_ssl => url.scheme == 'https' ) {|http|
http.put(url, data, header)
Expand Down
13 changes: 5 additions & 8 deletions test/net/http/test_http.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,14 +243,11 @@ def test_newobj
end

def test_failure_message_includes_failed_domain_and_port
# hostname to be included in the error message
host = Struct.new(:to_s).new("<example>")
port = 2119
# hack to let TCPSocket.open fail
def host.to_str; raise SocketError, "open failure"; end
uri = Struct.new(:scheme, :hostname, :port).new("http", host, port)
assert_raise_with_message(SocketError, /#{host}:#{port}/) do
TestNetHTTPUtils.clean_http_proxy_env{ Net::HTTP.get(uri) }
begin
Net::HTTP.get(URI.parse("http://example.invalid"))
fail "should have raised"
rescue => e
assert_includes e.message, "example.invalid:80"
end
end

Expand Down