files.com 1.0.177 → 1.0.178

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6236a38036cb59b5c102a43cfff3b17a952724d11adb7e7cb40e4c6094625b12
-  data.tar.gz: 05bffaed64301d1a786b5d95ddb4c4b998069845667229e8fc58c8f24d897301
+  metadata.gz: 8314f06e051c0563d980fca94b325614b675d6c406ddc7e286ebf132251cbd0c
+  data.tar.gz: e7e4cce1b266a01b4afacfdca4bbca65ab6c46e87e3be7cf6b9b828db31082bc
 SHA512:
-  metadata.gz: 7c53856d76605d84b64a35641cd130fdc490cc01376e753fc196f735029ca030120b41b4205925d21504a4f46f539142c4fcc3eefc3ce49bcb5ad87196e15f53
-  data.tar.gz: 2393d1836cdaf127d1b6bd05897718fc96ef9247a0f29af0ab5aa771747dfc571e3753c9a6e82f6a12cdaddf857b39e6c66f4de32c91d70d5be263955da89fae
+  metadata.gz: dde72ce18d054f8bd8c2ee9f0d2c0f0b99e5207663081c1d57b279640282ae42f07a2b77c88a5f42bef9198f24b61840deffe87edd77251fd97fba0c3a11bd5d
+  data.tar.gz: ee65038bc42cd105e3d89646d187b079be61244f049a63f5a363c0bf1ac165ed52492d16ce2c175a096e2bcdd71278d4789400d991802c78d9a35fefa24f7687

data/_VERSION

@@ -1 +1 @@
-1.0.177
+1.0.178

data/lib/files.com/api_client.rb

@@ -154,7 +154,12 @@ module Files
           http.request request do |response|
             io.fulfill_content_length(response.content_length) if io.respond_to?(:fulfill_content_length)
             response.read_body do |chunk|
+              response.error! if response.code.to_i >= 300
+              io.ready! if io.respond_to?(:ready!)
               io << chunk
+            rescue => e
+              io.set_error(e)  if io.respond_to?(:set_error)
+              io.close
             end
           end
         end

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

@@ -396,7 +396,7 @@ module Files
                      ensure
                        w.close
                      end
-                     r
+                     r.wait!(5)
                    end
     end
 

data/lib/files.com/sizable_io.rb

@@ -18,13 +18,18 @@ module Files
     end
 
     def close
+      raise @with_error if @with_error
       super
       read_io.content_length_promise.try_set(nil)
     end
 
+    def set_error(e)
+      read_io.with_error = e
+    end
+
     protected
 
-    attr_accessor :content_length
+    attr_accessor :content_length, :with_error
 
     def content_length_promise
       @content_length_promise ||= Concurrent::Promise.new { content_length }

data/spec/models/file_spec.rb

@@ -1,8 +1,8 @@
 require "spec_helper"
 require "tempfile"
 
-RSpec.describe Files::File, :with_test_folder do
-  xdescribe "#read" do
+RSpec.describe Files::File, :with_test_folder, skip: ENV["GITLAB"] do
+  describe "#read" do
     before do
       Files::File.open(test_folder.join("[[strange stuff]]#yes.text").to_s, 'w', options) do |f|
         f.write("contents")
@@ -13,9 +13,19 @@ RSpec.describe Files::File, :with_test_folder do
       file = Files::File.find(test_folder.join("[[strange stuff]]#yes.text").to_s, {}, options)
       expect(file.read).to eq("contents")
     end
+
+    context "stream failure" do
+      let(:expired_download) { "https://s3.amazonaws.com/objects.brickftp.com/metadata/37868/52f55a21-1685-46aa-aaff-99ca8b172c00?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAIEWLY3MN4YGZQOWA%2F20210621%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20210621T202802Z&X-Amz-Expires=60&X-Amz-SignedHeaders=host&response-cache-control=no-cache%2C%20no-store&response-content-disposition=attachment%3B%20filename%3D%22write-as-io.txt%22&response-content-type=text%2Fplain&X-Amz-Signature=83d5b5789cbd2282bfea6e560e4319385135204dc0df3217930f96905c9cb18f" }
+
+      it "waits for io to be ready" do
+        file = Files::File.new
+        allow(file).to receive(:download_uri_with_load).and_return(expired_download)
+        expect { file.read_io }.to raise_error('403 "Forbidden"')
+      end
+    end
   end
 
-  xdescribe "#read_io" do
+  describe "#read_io" do
     before do
       Files::File.open(test_folder.join("read.txt").to_s, 'w', options) do |f|
         f.write("contents")
@@ -28,9 +38,17 @@ RSpec.describe Files::File, :with_test_folder do
       expect(file.read_io.read).to eq("contents")
       expect(file.read_io.size).to eq("contents".length)
     end
+
+    it "works for file with zero bytes" do
+      file = Files::File.open("zero-byte.txt", 'w', options)
+      file.write("")
+      file.close
+      file = Files::File.find("zero-byte.txt", {}, options)
+      expect(file.read_io.read).to eq("")
+    end
   end
 
-  xdescribe "#write" do
+  describe "#write" do
     it "can take string" do
       Files::File.open(test_folder.join("write-as-string.txt").to_s, 'w', options) do |f|
         f.write("I am a string")
@@ -65,4 +83,18 @@ RSpec.describe Files::File, :with_test_folder do
       temp_file.close
     end
   end
+
+  describe "#download_content" do
+    let(:file) {
+      Files::File.open(test_folder.join("write-as-string.txt").to_s, 'w', options) do |f|
+        f.write("I am a string")
+      end
+    }
+
+    it "can take arbitrary IO" do
+      file.download_content(io = StringIO.new)
+
+      expect(io.tap(&:rewind).read).to eq("I am a string")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: files.com
 version: !ruby/object:Gem::Version
-  version: 1.0.177
+  version: 1.0.178
 platform: ruby
 authors:
 - files.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-16 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable