files.com 1.0.35 → 1.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19e707f4959f4ff9e8ce51199325bb0a3ecd91570dd5fcc4eabb5cac5ee39467
-  data.tar.gz: 47767a543fa853985ebd8cb03573331027a17dfefb1778558e9e617b881e22c5
+  metadata.gz: 06f7e1e1686656a44e8ebc1e30684c7d1dcc9262cddfaf269cff3f7df8e8dc97
+  data.tar.gz: e37f73015d704139ee38a89223976b0846b9cebfbe10f270032d7a6829e6ca12
 SHA512:
-  metadata.gz: ccedd2cfd8b6f4eb234eec5288686c1aba531f07625d2e21d10e4ddac589498fd6397760f7872f332d28903ce9112ab4260174ed658122c46e41c066685395f3
-  data.tar.gz: a477ed676cd337a577e26c1e696c7477a5da44605901296403eb8d4f05c0864e18e3a8dd51fbd5a5fe5fc9b8114b726995c51622b5d48bd0111dc046883e3eb6
+  metadata.gz: 35d8d4efb868ec674125be3e092216c0bbae7daf5292fc97418ab36be472ca6570f1cdcd83b467ec345d980786feb7ac31836dcd7b71dcbc364a259b15bb8c7e
+  data.tar.gz: c1ec9327fbe25deb422da0f22662ef17bc3dcb8e4643f72f82fa7ff6ce1075677659b5c9b69721a1de8f425debd9406197ea2486ceeeb7dc9b0bfc7fc5bd62ef

data/_VERSION

@@ -1 +1 @@
-1.0.35
+1.0.36

data/files.com.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.description = "The Files.com Ruby client."
   s.license     = "MIT"
   s.required_ruby_version = ">= 2.3"
-  s.add_dependency 'faraday', '>= 0.12.0'
+  s.add_dependency 'faraday', '>= 0.17.3'
   s.add_dependency 'net-http-persistent'
   s.add_dependency 'addressable', "~> 2.7.0"
 

data/lib/files.com/api_client.rb

@@ -14,29 +14,41 @@ module Files
       Thread.current[:files_api_client] || default_client
     end
 
+    # net_http_persistent does not support streaming downloads with faraday when directly downloading from S3
+    # falling back to net_http.
+    def self.download_client
+      Thread.current[:files_api_client_download_client] ||= ApiClient.new(download_conn)
+    end
+
+    def self.download_conn
+      Thread.current[:files_api_client_download_conn] ||= build_default_conn(force_net_http: true)
+    end
+
     def self.default_client
       Thread.current[:files_api_client_default_client] ||= ApiClient.new(default_conn)
     end
 
     def self.default_conn
-      Thread.current[:files_api_client_default_conn] ||= begin
-        conn = Faraday.new do |builder|
-          builder.use Faraday::Request::Multipart
-          builder.use Faraday::Request::UrlEncoded
-          builder.use Faraday::Response::RaiseError
-
-          if Gem.win_platform? || RUBY_PLATFORM == "java"
-            builder.adapter :net_http
-          else
-            builder.adapter :net_http_persistent
-          end
-        end
+      Thread.current[:files_api_client_default_conn] ||= build_default_conn
+    end
 
-        conn.proxy = Files.proxy if Files.proxy
-        conn.ssl.verify = true
+    def self.build_default_conn(force_net_http: false)
+      conn = Faraday.new do |builder|
+        builder.use Faraday::Request::Multipart
+        builder.use Faraday::Request::UrlEncoded
+        builder.use Faraday::Response::RaiseError
 
-        conn
+        if Gem.win_platform? || RUBY_PLATFORM == "java" || force_net_http
+          builder.adapter :net_http
+        else
+          builder.adapter :net_http_persistent
+        end
       end
+
+      conn.proxy = Files.proxy if Files.proxy
+      conn.ssl.verify = true
+
+      conn
     end
 
     def self.should_retry?(error, num_retries)
@@ -132,6 +144,19 @@ module Files
       end
     end
 
+    def stream_download(uri, io)
+      if conn.adapter == Faraday::Adapter::NetHttp
+        remote_request(:get, uri) do |req|
+          req.options.on_data = proc do |chunk, _overall_received_bytes|
+            io.write(chunk)
+          end
+        end
+      else
+        response = remote_request(:get, download_uri_with_load)
+        io.write(response.body)
+      end
+    end
+
     def cursor
       @last_response.http_headers["x-files-cursor"]
     end

data/lib/files.com/models/file.rb

@@ -149,13 +149,15 @@ module Files
 
     def self.upload_chunks(io, path, options, upload = nil, etags = [])
       etags ||= []
+      bytes_written = 0
       loop do
         upload = FileAction.begin_upload(path, { ref: upload&.ref, part: (upload&.part_number || 0) + 1 }, options)
         buf = io.read(upload.partsize) || ""
+        bytes_written += buf.length
         method = upload.http_method.downcase.to_sym
         response = client(options).remote_request(method, upload.upload_uri, { "Content-Length": buf.length.to_s }, buf)
         etags << { etag: response.headers["ETag"], part: upload.part_number }
-        return upload, etags if io.eof?
+        return upload, etags, bytes_written if io.eof?
       end
     end
 
@@ -303,8 +305,7 @@ module Files
     end
 
     def download_content(io)
-      response = client.remote_request(:get, download_uri_with_load)
-      io.write(response.body)
+      Files::ApiClient::download_client.stream_download(download_uri_with_load, io)
     end
 
     def each(*args, &block)
@@ -363,8 +364,8 @@ module Files
       if mode.include? "w"
         @write_io.rewind if @write_io.is_a?(StringIO)
 
-        @bytes_written += @write_io.size
-        @upload, @etags = File.upload_chunks(@write_io, path, options, @upload, @etags)
+        @upload, @etags, bytes_written = File.upload_chunks(@write_io, path, options, @upload, @etags)
+        @bytes_written += bytes_written
       elsif mode.include? "a"
         raise NotImplementedError
       end
@@ -388,11 +389,14 @@ module Files
 
     def read_io
       @read_io ||= begin
-        io = StringIO.new
-        download_content(io)
-        io.rewind
-        io
-      end
+                     r, w = IO.pipe
+                     Thread.new do
+                       download_content(w)
+                     ensure
+                       w.close
+                     end
+                     r
+                   end
     end
 
     def internal_encoding(*_args)

data/spec/models/file_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require "tempfile"
 
 RSpec.describe Files::File, :with_test_folder do
   describe "#read" do
@@ -14,6 +15,20 @@ RSpec.describe Files::File, :with_test_folder do
     end
   end
 
+  describe "#read_io" do
+    before do
+      Files::File.open(test_folder.join("read.txt").to_s, 'w', options) do |f|
+        f.write("contents")
+      end
+
+      it "returns an IO Object" do
+        file = Files::File.find(test_folder.join("read.txt").to_s, {}, options)
+        expect(file.read_io.class).to eq(IO)
+        expect(file.read_io.read).to eq("contents")
+      end
+    end
+  end
+
   describe "#write" do
     it "can take string" do
       Files::File.open(test_folder.join("write-as-string.txt").to_s, 'w', options) do |f|
@@ -32,5 +47,21 @@ RSpec.describe Files::File, :with_test_folder do
       file = Files::File.find(test_folder.join("write-as-io.txt").to_s, {}, options)
       expect(file.read).to eq("I am a string via IO")
     end
+
+    it "can take an IO without #size" do
+      temp_file = Tempfile.new("testing_io.txt")
+
+      temp_file.write("I am a string via IO")
+      temp_file.rewind
+      fd = IO.sysopen(temp_file.path)
+      io = IO.new(fd)
+
+      file = Files::File.open(test_folder.join("write-as-io.txt").to_s, 'w', options) do |f|
+        f.write(io)
+      end
+
+      expect(file.read).to eq("I am a string via IO")
+      temp_file.close
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: files.com
 version: !ruby/object:Gem::Version
-  version: 1.0.35
+  version: 1.0.36
 platform: ruby
 authors:
 - files.com
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.17.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.17.3
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement