down 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29dd2b9e7c612e2be576964dc0b35203d4e6b038
-  data.tar.gz: 3f9146bd292d11b4bcd82b196b8c59a4125cff2d
+  metadata.gz: 813656418d3c378ea8a8731355e5b46f830cbb9e
+  data.tar.gz: 73e7e5125c7b4a2912672f63512fc822bddb552d
 SHA512:
-  metadata.gz: 5dba71a205bb2f2e0353774e8801cf8692e1c0e5605bdb62810f9bd1ea16bc0076e8d17f2edaa7986ad019675a723c91b693bd8c8f9f19a8637f6aa2630ad040
-  data.tar.gz: d1d810b2defabd1a460dcd614e65d578b9c27f2ac6008efb5fd3d56c3a080cb12d721a4196383b9eb1349c7939cce9ff07716692a6c803f13eb095d136fd9aa4
+  metadata.gz: f6a6427ffec868c38a689f0d992af7d6187234cfbdd9c63c94ebeb9192174880742eb58c2f7a7d4faed90c86b9a731a369dbadaa5fc37280cb8ef41b64dbeb90
+  data.tar.gz: 615d0c7c046727e07bc0e67b82906d7f5ca508fde7eb6b1f38b9ff6f3db787ab0eea4c055acc4584651a669aca38714a8a41f1320064e10c8ed0f559ebfce52f

data/README.md

@@ -285,7 +285,7 @@ Down::NetHttp.open("http://example.com/image.jpg", {"Authorization" => "..."})
 ### HTTP.rb
 
 ```rb
-gem "down", "~> 3.0"
+gem "down", ">= 3.0"
 gem "http", "~> 2.1"
 ```
 ```rb

data/lib/down/chunked_io.rb

@@ -7,38 +7,37 @@ module Down
   class ChunkedIO
     attr_accessor :size, :data, :encoding
 
-    def initialize(chunks:, size: nil, on_close: ->{}, data: {}, rewindable: true, encoding: Encoding::BINARY)
-      @chunks   = chunks
-      @size     = size
-      @on_close = on_close
-      @data     = data
-      @encoding = find_encoding(encoding)
-
-      @buffer   = String.new("").force_encoding(@encoding)
-      @tempfile = Tempfile.new("down-chunked_io", binmode: true) if rewindable
+    def initialize(chunks:, size: nil, on_close: nil, data: {}, rewindable: true, encoding: nil)
+      @chunks     = chunks
+      @size       = size
+      @on_close   = on_close
+      @data       = data
+      @encoding   = find_encoding(encoding || Encoding::BINARY)
+      @rewindable = rewindable
+      @buffer     = nil
 
       retrieve_chunk
     end
 
     def each_chunk
-      raise IOError, "closed stream" if @closed
+      raise IOError, "closed stream" if closed?
 
       return enum_for(__method__) if !block_given?
       yield retrieve_chunk until chunks_depleted?
     end
 
     def read(length = nil, outbuf = nil)
-      raise IOError, "closed stream" if @closed
+      raise IOError, "closed stream" if closed?
 
       outbuf = outbuf.to_s.replace("").force_encoding(@encoding)
 
-      if @tempfile && !@tempfile.eof?
-        @tempfile.read(length, outbuf)
+      if cache && !cache.eof?
+        cache.read(length, outbuf)
         outbuf.force_encoding(@encoding)
       end
 
-      until outbuf.bytesize == length || chunks_depleted?
-        @buffer << retrieve_chunk if @buffer.empty?
+      until outbuf.bytesize == length || (@buffer.nil? && chunks_depleted?)
+        @buffer = retrieve_chunk if @buffer.nil?
 
         buffered_data = if length && length - outbuf.bytesize < @buffer.bytesize
                           @buffer.byteslice(0, length - outbuf.bytesize)
@@ -46,45 +45,87 @@ module Down
                           @buffer
                         end
 
-        @tempfile.write(buffered_data) if @tempfile
-
         outbuf << buffered_data
 
+        cache.write(buffered_data) if cache
+
         if buffered_data.bytesize < @buffer.bytesize
-          @buffer.replace @buffer.byteslice(buffered_data.bytesize..-1)
+          @buffer = @buffer.byteslice(buffered_data.bytesize..-1)
         else
-          @buffer.clear
+          @buffer = nil
         end
       end
 
-      outbuf unless length && outbuf.empty?
+      outbuf unless outbuf.empty? && length
+    end
+
+    def readpartial(maxlen = nil, outbuf = nil)
+      raise IOError, "closed stream" if closed?
+
+      available_length  = 0
+      available_length += cache.size - cache.pos if cache
+      available_length += @buffer.bytesize if @buffer
+
+      if available_length > 0
+        read([available_length, *maxlen].min, outbuf)
+      elsif !chunks_depleted?
+        read([@next_chunk.bytesize, *maxlen].min, outbuf)
+      else
+        outbuf.replace("").force_encoding(@encoding) if outbuf
+        raise EOFError, "end of file reached"
+      end
     end
 
     def eof?
-      raise IOError, "closed stream" if @closed
+      raise IOError, "closed stream" if closed?
 
-      return false if @tempfile && !@tempfile.eof?
-      @buffer.empty? && chunks_depleted?
+      return false if cache && !cache.eof?
+      @buffer.nil? && chunks_depleted?
     end
 
     def rewind
-      raise IOError, "closed stream" if @closed
-      raise IOError, "this Down::ChunkedIO is not rewindable" if !@tempfile
+      raise IOError, "closed stream" if closed?
+      raise IOError, "this Down::ChunkedIO is not rewindable" if cache.nil?
 
-      @tempfile.rewind
+      cache.rewind
     end
 
     def close
       return if @closed
 
       chunks_fiber.resume(:terminate) if chunks_fiber.alive?
-      @buffer.clear
-      @tempfile.close! if @tempfile
+      @buffer = nil
+      cache.close! if cache
       @closed = true
     end
 
+    def closed?
+      !!@closed
+    end
+
+    def rewindable?
+      @rewindable
+    end
+
+    def inspect
+      string  = String.new
+      string << "#<Down::ChunkedIO"
+      string << " chunks=#{@chunks.inspect}"
+      string << " size=#{size.inspect}"
+      string << " encoding=#{encoding.inspect}"
+      string << " data=#{data.inspect}"
+      string << " on_close=#{@on_close.inspect}"
+      string << " rewindable=#{@rewindable.inspect}"
+      string << " (closed)" if closed?
+      string << ">"
+    end
+
     private
 
+    def cache
+      @cache ||= Tempfile.new("down-chunked_io", binmode: true) if @rewindable
+    end
+
     def retrieve_chunk
       chunk = @next_chunk
       @next_chunk = chunks_fiber.resume
@@ -103,7 +144,7 @@ module Down
             break if action == :terminate
           end
         ensure
-          @on_close.call
+          @on_close.call if @on_close
         end
       end
     end

data/lib/down/http.rb

@@ -62,9 +62,7 @@ module Down
       io.close if io
     end
 
-    def open(url, **options, &block)
-      rewindable = options.delete(:rewindable)
-
+    def open(url, rewindable: true, **options, &block)
       begin
         response = get(url, **options, &block)
         response_error!(response) if !response.status.success?
@@ -72,16 +70,14 @@ module Down
         request_error!(exception)
       end
 
-      down_options = {
-        chunks: response.body.enum_for(:each),
-        size:   response.content_length,
-        data:   { status: response.code, headers: response.headers.to_h, response: response },
-      }
-      down_options[:encoding]   = response.content_type.charset if response.content_type.charset
-      down_options[:on_close]   = -> { response.connection.close } unless client.persistent?
-      down_options[:rewindable] = rewindable if rewindable != nil
-
-      Down::ChunkedIO.new(down_options)
+      Down::ChunkedIO.new(
+        chunks:     response.body.enum_for(:each),
+        size:       response.content_length,
+        encoding:   response.content_type.charset,
+        rewindable: rewindable,
+        on_close:   (-> { response.connection.close } unless client.persistent?),
+        data:       { status: response.code, headers: response.headers.to_h, response: response },
+      )
     end
 
     def get(url, **options, &block)

data/lib/down/net_http.rb

@@ -180,23 +180,21 @@ module Down
         request_error!(exception)
       end
 
-      down_params = {
-        chunks: response.enum_for(:read_body),
-        size: response["Content-Length"] && response["Content-Length"].to_i,
-        on_close: -> { request.resume }, # close HTTP connnection
+      Down::ChunkedIO.new(
+        chunks:     response.enum_for(:read_body),
+        size:       response["Content-Length"] && response["Content-Length"].to_i,
+        encoding:   response.type_params["charset"],
+        rewindable: options.fetch(:rewindable, true),
+        on_close:   -> { request.resume }, # close HTTP connnection
         data: {
-          status: response.code.to_i,
-          headers: response.each_header.inject({}) { |headers, (downcased_name, value)|
-            name = downcased_name.split("-").map(&:capitalize).join("-")
-            headers.merge!(name => value)
-          },
+          status:   response.code.to_i,
+          headers:  response.each_header.inject({}) { |headers, (downcased_name, value)|
+                      name = downcased_name.split("-").map(&:capitalize).join("-")
+                      headers.merge!(name => value)
+                    },
           response: response,
-        }
-      }
-      down_params[:rewindable] = options[:rewindable] if options.key?(:rewindable)
-      down_params[:encoding] = response.type_params["charset"] if response.type_params["charset"]
-
-      Down::ChunkedIO.new(down_params)
+        },
+      )
     end
 
     def copy_to_tempfile(basename, io)

data/lib/down/version.rb

@@ -1,3 +1,3 @@
 module Down
-  VERSION = "3.1.0"
+  VERSION = "3.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: down
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-16 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest