down 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '08443f7ebc7a853be6b2c24d0cff24795af18bdf'
-  data.tar.gz: c723068fcc5675755bb90f51ab8eab1fe21a3cef
+  metadata.gz: 5e6bbd2b9b51b4b88834180552227abece0bed9a
+  data.tar.gz: 102d96a339e3a252af86a59d99dd992ad80a2bac
 SHA512:
-  metadata.gz: 0b9b5ec3d60c3dc7d035bf79e29767d22e2de97b05e060fcc477da5ea3d9015b8f19c26b2414e94643268123fedaa427e2e3d69c47d614109874788315bc93dd
-  data.tar.gz: e98698c9fb10d4163b3ec33eb63b1ef38cb62b069835620c01ed93d7994d38b99c3b55a3f5eace5fe628b1f9c1fb6d93a17ea1e6cae75bb3d119bb5a484a391a
+  metadata.gz: ae39c2f9a1e29a0d75af0ec43efcb02b9d5774a3aa3eb4c0ec1d73cd14552b7a405050e3c39b81857db97cda8355b744823bc375523f2a99a4966e5a5ac35767
+  data.tar.gz: a3f8183ed4fdd120cc35dfbb69231975c86411f23e3e17007b737edf7a8963735af807679eb8e704af3e58828f8901283094b3c23ed620e0e2f2468a66e79320

data/README.md

@@ -17,6 +17,7 @@ Tempfile:
 
 ```rb
 require "down"
+
 tempfile = Down.download("http://example.com/nature.jpg")
 tempfile #=> #<Tempfile:/var/folders/k7/6zx6dx6x7ys3rv3srh0nyfj00000gn/T/20150925-55456-z7vxqz.jpg>
 ```
@@ -141,21 +142,26 @@ status was 4xx or 5xx.
 
 ### `Down::ChunkedIO`
 
-The `Down.open` method uses `Down::ChunkedIO` internally. However,
-`Down::ChunkedIO` is designed to be generic, it can wrap any kind of streaming.
+The `Down.open` performs HTTP logic and returns an instance of
+`Down::ChunkedIO`. However, `Down::ChunkedIO` is a generic class that can wrap
+any kind of streaming. It accepts an `Enumerator` that yields chunks of
+content, and provides IO-like interface over that enumerator, calling it
+whenever more content is needed.
 
 ```rb
+require "down/chunked_io"
+
 Down::ChunkedIO.new(...)
 ```
 
-* `:chunks` – an `Enumerator` which retrieves chunks
+* `:chunks` – `Enumerator` that yields chunks of content
 * `:size` – size of the file if it's known (returned by `#size`)
 * `:on_close` – called when streaming finishes or IO is closed
 * `:data` - custom data that you want to store (returned by `#data`)
 * `:rewindable` - whether to cache retrieved data into a file (defaults to `true`)
 * `:encoding` - force content to be returned in specified encoding (defaults to `Encoding::BINARY`)
 
-Here is an example of wrapping streaming MongoDB files:
+Here is an example of creating a streaming IO of a MongoDB GridFS file:
 
 ```rb
 require "down/chunked_io"

data/down.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "minitest", "~> 5.8"
   spec.add_development_dependency "mocha"
-  spec.add_development_dependency "http", "~> 2.1"
+  spec.add_development_dependency "http", "~> 3.0"
   spec.add_development_dependency "posix-spawn" unless RUBY_ENGINE == "jruby"
   spec.add_development_dependency "http_parser.rb"
   spec.add_development_dependency "docker-api"

data/lib/down/http.rb

@@ -59,9 +59,13 @@ module Down
     end
 
     def open(url, rewindable: true, **options, &block)
-      response = get(url, **options, &block)
+      begin
+        response = get(url, **options, &block)
+      rescue => exception
+        request_error!(exception)
+      end
 
-      response_error!(response) if !response.status.success?
+      response_error!(response) unless response.status.success?
 
       body_chunks = Enumerator.new do |yielder|
         begin
@@ -79,8 +83,6 @@ module Down
         on_close:   (-> { response.connection.close } unless @client.persistent?),
         data:       { status: response.code, headers: response.headers.to_h, response: response },
       )
-    rescue => exception
-      request_error!(exception)
     end
 
     private
@@ -112,24 +114,15 @@ module Down
 
     def request_error!(exception)
       case exception
-      when HTTP::Request::UnsupportedSchemeError
+      when HTTP::Request::UnsupportedSchemeError, Addressable::URI::InvalidURIError
         raise Down::InvalidUrl, exception.message
-      when Errno::ECONNREFUSED
-        raise Down::ConnectionError, "connection was refused"
-      when HTTP::ConnectionError,
-           Errno::ECONNABORTED,
-           Errno::ECONNRESET,
-           Errno::EPIPE,
-           Errno::EINVAL,
-           Errno::EHOSTUNREACH
+      when HTTP::ConnectionError
         raise Down::ConnectionError, exception.message
-      when SocketError
-        raise Down::ConnectionError, "domain name could not be resolved"
       when HTTP::TimeoutError
         raise Down::TimeoutError, exception.message
       when HTTP::Redirector::TooManyRedirectsError
         raise Down::TooManyRedirects, exception.message
-      when defined?(OpenSSL) && OpenSSL::SSL::SSLError
+      when OpenSSL::SSL::SSLError
         raise Down::SSLError, exception.message
       else
         raise exception

data/lib/down/net_http.rb

@@ -1,7 +1,7 @@
 # frozen-string-literal: true
 
 require "open-uri"
-require "net/http"
+require "net/https"
 
 require "down/backend"
 
@@ -60,15 +60,18 @@ module Down
 
       begin
         uri = URI(uri)
+        raise Down::InvalidUrl, "URL scheme needs to be http or https" unless uri.is_a?(URI::HTTP)
+      rescue URI::InvalidURIError => exception
+        raise Down::InvalidUrl, exception.message
+      end
 
-        fail Down::InvalidUrl, "URL scheme needs to be http or https" unless uri.is_a?(URI::HTTP)
-
-        if uri.user || uri.password
-          open_uri_options[:http_basic_authentication] ||= [uri.user, uri.password]
-          uri.user = nil
-          uri.password = nil
-        end
+      if uri.user || uri.password
+        open_uri_options[:http_basic_authentication] ||= [uri.user, uri.password]
+        uri.user = nil
+        uri.password = nil
+      end
 
+      begin
         downloaded_file = uri.open(open_uri_options)
       rescue OpenURI::HTTPRedirect => exception
         if (tries -= 1) > 0
@@ -80,7 +83,7 @@ module Down
 
           retry
         else
-          fail Down::TooManyRedirects, "too many redirects"
+          raise Down::TooManyRedirects, "too many redirects"
         end
       rescue OpenURI::HTTPError => exception
         code, message = exception.io.status
@@ -110,9 +113,13 @@ module Down
 
     def open(uri, options = {})
       options = @options.merge(options)
-      uri     = URI(uri)
 
-      fail Down::InvalidUrl, "URL scheme needs to be http or https" unless uri.is_a?(URI::HTTP)
+      begin
+        uri = URI(uri)
+        raise Down::InvalidUrl, "URL scheme needs to be http or https" unless uri.is_a?(URI::HTTP)
+      rescue URI::InvalidURIError => exception
+        raise Down::InvalidUrl, exception.message
+      end
 
       http_class = Net::HTTP
 
@@ -125,7 +132,6 @@ module Down
 
       # taken from open-uri implementation
       if uri.is_a?(URI::HTTPS)
-        require "net/https"
         http.use_ssl = true
         http.verify_mode = options[:ssl_verify_mode] || OpenSSL::SSL::VERIFY_PEER
         store = OpenSSL::X509::Store.new
@@ -157,7 +163,11 @@ module Down
         end
       end
 
-      response = request.resume
+      begin
+        response = request.resume
+      rescue => exception
+        request_error!(exception)
+      end
 
       response_error!(response) unless (200..299).cover?(response.code.to_i)
 
@@ -184,8 +194,6 @@ module Down
           response: response,
         },
       )
-    rescue => exception
-      request_error!(exception)
     end
 
     private
@@ -219,24 +227,13 @@ module Down
 
     def request_error!(exception)
       case exception
-      when URI::InvalidURIError
-        raise Down::InvalidUrl, "URL was invalid"
-      when Errno::ECONNREFUSED
-        raise Down::ConnectionError, "connection was refused"
-      when EOFError,
-           IOError,
-           Errno::ECONNABORTED,
-           Errno::ECONNRESET,
-           Errno::EPIPE,
-           Errno::EINVAL,
-           Errno::EHOSTUNREACH
+      when Errno::ETIMEDOUT, Net::OpenTimeout
+        raise Down::TimeoutError, "timed out waiting for connection to open"
+      when Net::ReadTimeout
+        raise Down::TimeoutError, "timed out while reading data"
+      when EOFError, IOError, SocketError, SystemCallError
         raise Down::ConnectionError, exception.message
-      when SocketError
-        raise Down::ConnectionError, "domain name could not be resolved"
-      when Errno::ETIMEDOUT,
-           Timeout::Error
-        raise Down::TimeoutError, "request timed out"
-      when defined?(OpenSSL) && OpenSSL::SSL::SSLError
+      when OpenSSL::SSL::SSLError
         raise Down::SSLError, exception.message
       else
         raise exception

data/lib/down/version.rb

@@ -1,5 +1,5 @@
 # frozen-string-literal: true
 
 module Down
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: down
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2017-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: posix-spawn
   requirement: !ruby/object:Gem::Requirement