Support HTTPS in Downloads::File#http_get_streaming

This commit is contained in:
Peter Graham
2013-02-22 23:07:34 -08:00
parent c0257916b4
commit 4330e85b17
2 changed files with 22 additions and 3 deletions

View File

@@ -41,8 +41,8 @@ module Downloads
limit = 4
while true
unless url.is_a?(URI::HTTP)
raise Error.new("URL must be HTTP")
unless url.is_a?(URI::HTTP) || url.is_a?(URI::HTTPS)
raise Error.new("URL must be HTTP or HTTPS")
end
headers = {
@@ -50,7 +50,7 @@ module Downloads
}
@source, headers = before_download(source, headers)
Net::HTTP.start(url.host, url.port) do |http|
Net::HTTP.start(url.host, url.port, :use_ssl => url.is_a?(URI::HTTPS)) do |http|
http.read_timeout = 10
http.request_get(url.request_uri, headers) do |res|
case res

View File

@@ -39,5 +39,24 @@ module Downloads
assert_match(/image\/gif/, @download.content_type)
end
end
context "A post download with an HTTPS source" do
setup do
@source = "https://www.google.com/intl/en_ALL/images/logo.gif"
@tempfile = Tempfile.new("danbooru-test")
@download = Downloads::File.new(@source, @tempfile.path)
end
teardown do
@tempfile.close
end
should "stream a file from an HTTPS source" do
@download.http_get_streaming do |resp|
assert_equal("200", resp.code)
assert(resp["Content-Length"].to_i > 0, "File should be larger than 0 bytes")
end
end
end
end
end