Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,13 @@ jobs:
fail-fast: false
matrix:
ruby:
- "2.4"
- "2.5"
- "2.6"
- "2.7"
- "3.0"
- "3.1"
- "3.2"
- "3.3"
- "3.4"
- "4.0"
- "jruby-9.4"

services:
Expand Down
7 changes: 4 additions & 3 deletions down.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Gem::Specification.new do |spec|
spec.name = "down"
spec.version = Down::VERSION

spec.required_ruby_version = ">= 2.4"
spec.required_ruby_version = ">= 2.7"

spec.summary = "Robust streaming downloads using Net::HTTP, http.rb or HTTPX."
spec.homepage = "https://github.com/janko/down"
Expand All @@ -16,12 +16,13 @@ Gem::Specification.new do |spec|
spec.require_path = "lib"

spec.add_dependency "addressable", "~> 2.8"
spec.add_dependency "base64", "~> 0.3"

spec.add_development_dependency "minitest", "~> 5.8"
spec.add_development_dependency "mocha", "~> 1.5"
spec.add_development_dependency "rake"
spec.add_development_dependency "httpx", RUBY_VERSION >= "2.7" ? "~> 1.0" : "~> 0.24"
spec.add_development_dependency "http", RUBY_VERSION >= "2.5" ? "~> 5.0" : "~> 4.3"
spec.add_development_dependency "httpx", "~> 1.0", "< 1.4.4"
spec.add_development_dependency "http", "~> 5.0"
spec.add_development_dependency "warning"
spec.add_development_dependency "csv"
end
6 changes: 3 additions & 3 deletions lib/down/net_http.rb
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def download(url, *args, **options)
uri.password = nil
end

open_uri_file = open_uri(uri, open_uri_options, follows_remaining: max_redirects, auth_on_redirect: )
open_uri_file = open_uri(uri, open_uri_options, follows_remaining: max_redirects, auth_on_redirect: auth_on_redirect)

# Handle the fact that open-uri returns StringIOs for small files.
extname = extension ? ".#{extension}" : File.extname(open_uri_file.base_uri.path)
Expand All @@ -117,7 +117,7 @@ def open(url, *args, **options)

# Create a Fiber that halts when response headers are received.
request = Fiber.new do
net_http_request(uri, options, follows_remaining: max_redirects, auth_on_redirect:) do |response|
net_http_request(uri, options, follows_remaining: max_redirects, auth_on_redirect: auth_on_redirect) do |response|
Fiber.yield response
end
end
Expand Down Expand Up @@ -249,7 +249,7 @@ def net_http_request(uri, options, follows_remaining:, auth_on_redirect:, &block
uri.password = nil unless auth_on_redirect
end

net_http_request(location, options, follows_remaining: follows_remaining - 1, auth_on_redirect:, &block)
net_http_request(location, options, follows_remaining: follows_remaining - 1, auth_on_redirect: auth_on_redirect, &block)
end
end

Expand Down
Loading