down 2.3.5 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bf3ed1b7156874c7452fc3b697516aca5754285
-  data.tar.gz: bac47c30b0601e0c66178aa6b236375ad045259f
+  metadata.gz: 5742b5429e56268121f7c44d6f3f43a1d980ed93
+  data.tar.gz: 73baaef981286e0cfcc2ac51eb53dbbac168d240
 SHA512:
-  metadata.gz: 4446ab1e62fadbd76427cb9df6a1feb685849ba17a58195f482a24123c2a1101e1b26b7a563c8c68bdaebaba1f92cd3e95e24022ee20b71bbd43f4923d6bc70b
-  data.tar.gz: 8a2a55094e87cc42bb8156d5b0c840fa155f89929da1d4b7d711de0fa599a3a7de03bcd85351f7071ad9c31c63ca63321673860a7fbc1c9fde48548b905abb4b
+  metadata.gz: 667d87034446d1b54e41fd0bd871a7279da7a0970faa23a8e47a75c728d8cbaf10d8b5fc3bc779205250e14e45a4db16a8a79bdc878aea6e0860eb9decb6fe02
+  data.tar.gz: 1c23677ec51dd05c30a409e157406d3549ea052a6ce15e2f5351a52ef0a13f4491de2f14471162acbb75fd481b62d093d6349525ecbe3e32c811ba2bfe8fc145

data/README.md

@@ -127,7 +127,7 @@ tempfile.path #=> "/var/folders/k7/6zx6dx6x7ys3rv3srh0nyfj00000gn/T/down20151116
 
 ## Streaming
 
-Down has the ability to access contents of the remote file *as it is being
+Down has the ability to access content of the remote file *as it is being
 downloaded*. The `Down.open` method returns an IO object which represents the
 remote file on the given URL. When you read from it, Down internally downloads
 chunks of the remote file, but only how much is needed.
@@ -173,6 +173,8 @@ Down::ChunkedIO.new(...)
 Here is an example of wrapping streaming MongoDB files:
 
 ```rb
+require "down/chunked_io"
+
 mongo = Mongo::Client.new(...)
 bucket = mongo.database.fs
 
@@ -186,8 +188,6 @@ io = Down::ChunkedIO.new(
 )
 ```
 
-### Down
-
 ## Supported Ruby versions
 
 * MRI 1.9.3

data/lib/down.rb

@@ -1,4 +1,5 @@
 require "down/version"
+require "down/chunked_io"
 
 require "open-uri"
 require "net/http"
@@ -81,6 +82,7 @@ module Down
     warn "Down.stream is deprecated and will be removed in Down 3. Use Down.open instead."
     io = open(url, options)
     io.each_chunk { |chunk| yield chunk, io.size }
+    io.close
   end
 
   def open(url, options = {})
@@ -113,11 +115,12 @@ module Down
     end
 
     response = request.resume
-    content_length = Integer(response["Content-Length"]) if response["Content-Length"]
-    chunks = response.to_enum(:read_body)
-    close_connection = -> { request.resume }
 
-    ChunkedIO.new(size: content_length, chunks: chunks, on_close: close_connection)
+    ChunkedIO.new(
+      chunks: response.enum_for(:read_body),
+      size: response["Content-Length"] && response["Content-Length"].to_i,
+      on_close: -> { request.resume },
+    )
   end
 
   def copy_to_tempfile(basename, io)
@@ -134,86 +137,21 @@ module Down
     tempfile
   end
 
-  class ChunkedIO
-    attr_reader :tempfile
-
-    def initialize(options)
-      @size     = options.fetch(:size)
-      @chunks   = options.fetch(:chunks)
-      @on_close = options.fetch(:on_close, ->{})
-      @tempfile = Tempfile.new("down", binmode: true)
-    end
-
-    def size
-      @size
-    end
-
-    def read(length = nil, outbuf = nil)
-      download_chunk until enough_downloaded?(length) || download_finished?
-      @tempfile.read(length, outbuf)
-    end
-
-    def each_chunk
-      return enum_for(__method__) if !block_given?
-      yield download_chunk until download_finished?
-    end
-
-    def eof?
-      @tempfile.eof? && download_finished?
-    end
-
-    def rewind
-      @tempfile.rewind
-    end
-
-    def close
-      terminate_download
-      @tempfile.close!
+  module DownloadedFile
+    def original_filename
+      filename_from_content_disposition || filename_from_uri
     end
 
     private
 
-    def download_chunk
-      chunk = @chunks.next
-      write(chunk)
-      begin
-        @chunks.peek
-      rescue StopIteration
-        terminate_download
-      end
-      chunk
-    end
-
-    def enough_downloaded?(length)
-      length && (@tempfile.pos + length <= @tempfile.size)
-    end
-
-    def download_finished?
-      !@on_close
-    end
-
-    def terminate_download
-      if @on_close
-        @on_close.call
-        @on_close = nil
-      end
-    end
-
-    def write(chunk)
-      current_pos = @tempfile.pos
-      @tempfile.pos = @tempfile.size
-      @tempfile.write(chunk)
-      @tempfile.pos = current_pos
+    def filename_from_content_disposition
+      meta["content-disposition"].to_s[/filename="([^"]+)"/, 1]
     end
-  end
 
-  module DownloadedFile
-    def original_filename
+    def filename_from_uri
       path = base_uri.path
-      unless path.empty? || path == "/"
-        filename = path.split("/").last
-        CGI.unescape(filename)
-      end
+      filename = path.split("/").last
+      CGI.unescape(filename) if filename
     end
   end
 end

data/lib/down/chunked_io.rb

@@ -0,0 +1,76 @@
+require "tempfile"
+
+module Down
+  class ChunkedIO
+    attr_reader :tempfile
+
+    def initialize(options)
+      @size     = options.fetch(:size)
+      @chunks   = options.fetch(:chunks)
+      @on_close = options.fetch(:on_close, ->{})
+      @tempfile = Tempfile.new("down", binmode: true)
+    end
+
+    def size
+      @size
+    end
+
+    def read(length = nil, outbuf = nil)
+      download_chunk until enough_downloaded?(length) || download_finished?
+      @tempfile.read(length, outbuf)
+    end
+
+    def each_chunk
+      return enum_for(__method__) if !block_given?
+      yield download_chunk until download_finished?
+    end
+
+    def eof?
+      @tempfile.eof? && download_finished?
+    end
+
+    def rewind
+      @tempfile.rewind
+    end
+
+    def close
+      terminate_download
+      @tempfile.close!
+    end
+
+    private
+
+    def download_chunk
+      chunk = @chunks.next
+      write(chunk)
+      begin
+        @chunks.peek
+      rescue StopIteration
+        terminate_download
+      end
+      chunk
+    end
+
+    def enough_downloaded?(length)
+      length && (@tempfile.pos + length <= @tempfile.size)
+    end
+
+    def download_finished?
+      !@on_close
+    end
+
+    def terminate_download
+      if @on_close
+        @on_close.call
+        @on_close = nil
+      end
+    end
+
+    def write(chunk)
+      current_pos = @tempfile.pos
+      @tempfile.pos = @tempfile.size
+      @tempfile.write(chunk)
+      @tempfile.pos = current_pos
+    end
+  end
+end

data/lib/down/version.rb

@@ -1,3 +1,3 @@
 module Down
-  VERSION = "2.3.5"
+  VERSION = "2.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: down
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -77,6 +77,7 @@ files:
 - README.md
 - down.gemspec
 - lib/down.rb
+- lib/down/chunked_io.rb
 - lib/down/version.rb
 homepage: https://github.com/janko-m/down
 licenses:
@@ -103,4 +104,3 @@ signing_key:
 specification_version: 4
 summary: Robust streaming downloads using net/http.
 test_files: []
-has_rdoc: