boxr 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04ca88d5d328877cca29dd525572f39a8d08eb1fab798f161854746daa7b8679
-  data.tar.gz: 2243419e800241709f0565b0f4ce698e62ebce286f2a1eead58e50202ea66ecb
+  metadata.gz: 6969054c88e9121a9e493624a6ca310e25ecef80e7e090a0787072316c134d14
+  data.tar.gz: 3bfbb76ecc1ea2b5ee087957d287c6c19cd83ad1ae7223cfaf63e15860c85746
 SHA512:
-  metadata.gz: d3b6c2986449944d0d5cca6a2305e615e7387adff4d1e932bad5eb5431d7b48b87c57bb0d6c95a06586e0a98c896aaff94c09cf56a2ae8e9a7a6da36e878b911
-  data.tar.gz: d8d373850ad0b6f4ac9d99501dfe62a74ff00590a109c05ef7ea7bd1ea579036629114fe5de289db17234da45a49256d365046a819a9332dc2e8cf123fd933ae
+  metadata.gz: d13fcc1f7f992e067ca2e08c46dc76b415e61876081cdfd3d0431d5eebe3e7a012647278e4242a649c50b94cc29f44cc06ae1a817040b1fa979f4bd1eb9d850e
+  data.tar.gz: b60656c4fe173dd46ab2db57cad3d9db619c2e9eb234a47b7894ef7a22a37b35fad1bcdaf4842258f8fc0da490686b0b8a1b4be7620e0e0d05aded338947947d

data/lib/boxr/files.rb

@@ -75,6 +75,7 @@ module Boxr
 
     def download_file(file, version: nil, follow_redirect: true)
       file_id = ensure_id(file)
+
       begin
         uri = "#{FILES_URI}/#{file_id}/content"
         query = {}
@@ -85,7 +86,8 @@ module Boxr
           location = response.header['Location'][0]
 
           if(follow_redirect)
-            file, response = get(location, process_response: false)
+            file_content, response = get(location, process_response: false)
+            return file_content
           else
             return location #simply return the url
           end
@@ -93,9 +95,7 @@ module Boxr
           retry_after_seconds = response.header['Retry-After'][0]
           sleep retry_after_seconds.to_i
         end
-      end until file
-
-      file
+      end until file_content
     end
 
     def download_url(file, version: nil)
@@ -104,27 +104,31 @@ module Boxr
 
     def upload_file(path_to_file, parent, name: nil, content_created_at: nil, content_modified_at: nil,
                     preflight_check: true, send_content_md5: true)
-
-      parent_id = ensure_id(parent)
-
       filename = name ? name : File.basename(path_to_file)
-      preflight_check(path_to_file, filename, parent_id) if preflight_check
-
-      file_info = nil
-      response = nil
 
       File.open(path_to_file) do |file|
-        content_md5 = send_content_md5 ? Digest::SHA1.file(file).hexdigest : nil
+        upload_file_from_io(file, parent, name: filename, content_created_at: content_created_at, content_modified_at: content_modified_at, preflight_check: preflight_check, send_content_md5: send_content_md5)
+      end
+    end
 
-        attributes = {name: filename, parent: {id: parent_id}}
-        attributes[:content_created_at] = content_created_at.to_datetime.rfc3339 unless content_created_at.nil?
-        attributes[:content_modified_at] = content_modified_at.to_datetime.rfc3339 unless content_modified_at.nil?
+    def upload_file_from_io(io, parent, name:, content_created_at: nil, content_modified_at: nil, preflight_check: true, send_content_md5: true)
+      parent_id = ensure_id(parent)
 
-        body = {attributes: JSON.dump(attributes), file: file}
+      preflight_check(io, name, parent_id) if preflight_check
 
-        file_info, response = post(FILES_UPLOAD_URI, body, process_body: false, content_md5: content_md5)
+      if send_content_md5
+        content_md5 = Digest::SHA1.hexdigest(io.read)
+        io.rewind
       end
 
+      attributes = {name: name, parent: {id: parent_id}}
+      attributes[:content_created_at] = content_created_at.to_datetime.rfc3339 unless content_created_at.nil?
+      attributes[:content_modified_at] = content_modified_at.to_datetime.rfc3339 unless content_modified_at.nil?
+
+      body = {attributes: JSON.dump(attributes), file: io}
+
+      file_info, response = post(FILES_UPLOAD_URI, body, process_body: false, content_md5: content_md5)
+
       file_info.entries[0]
     end
 
@@ -254,8 +258,8 @@ module Boxr
 
     private
 
-    def preflight_check(path_to_file, filename, parent_id)
-      size = File.size(path_to_file)
+    def preflight_check(io, filename, parent_id)
+      size = File.size(io)
 
       #TODO: need to make sure that figuring out the filename from the path_to_file works for people using Windows
       attributes = {name: filename, parent: {id: "#{parent_id}"}, size: size}

data/lib/boxr/version.rb

@@ -1,3 +1,3 @@
 module Boxr
-  VERSION = "1.10.0"
+  VERSION = "1.11.0"
 end

data/spec/boxr/files_spec.rb

@@ -12,6 +12,11 @@ describe "file operations" do
     new_file = BOX_CLIENT.upload_file("./spec/test_files/#{TEST_FILE_NAME}", @test_folder, name: TEST_FILE_NAME_CUSTOM)
     expect(new_file.name).to eq(TEST_FILE_NAME_CUSTOM)
 
+    puts "upload a file from IO"
+    io = File.open("./spec/test_files/#{TEST_FILE_NAME}")
+    new_file = BOX_CLIENT.upload_file_from_io(io, @test_folder, name: TEST_FILE_NAME_IO)
+    expect(new_file.name).to eq(TEST_FILE_NAME_IO)
+
     puts "get file using path"
     file = BOX_CLIENT.file_from_path("/#{TEST_FOLDER_NAME}/#{TEST_FILE_NAME}")
     expect(file.id).to eq(test_file.id)
@@ -50,13 +55,16 @@ describe "file operations" do
     expect(unlocked_file.lock).to be_nil
 
     puts "download file"
-    file = BOX_CLIENT.download_file(test_file)
+    file_content = BOX_CLIENT.download_file(test_file)
     f = File.open("./spec/test_files/#{DOWNLOADED_TEST_FILE_NAME}", 'w+')
-    f.write(file)
+    f.write(file_content)
     f.close
     expect(FileUtils.identical?("./spec/test_files/#{TEST_FILE_NAME}","./spec/test_files/#{DOWNLOADED_TEST_FILE_NAME}")).to eq(true)
     File.delete("./spec/test_files/#{DOWNLOADED_TEST_FILE_NAME}")
 
+    puts "download invalid file"
+    expect { BOX_CLIENT.download_file('INVALID_FILE_NAME.pdf') }.to raise_exception(Boxr::BoxrError)
+
     puts "upload new version of file"
     new_version = BOX_CLIENT.upload_new_version_of_file("./spec/test_files/#{TEST_FILE_NAME}", test_file)
     expect(new_version.id).to eq(test_file.id)

data/spec/boxr_spec.rb

@@ -29,6 +29,7 @@ describe Boxr::Client do
   SUB_FOLDER_DESCRIPTION = 'This was created by the Boxr test suite'
   TEST_FILE_NAME = 'test file.txt'
   TEST_FILE_NAME_CUSTOM = 'test file custom.txt'
+  TEST_FILE_NAME_IO = 'test file io.txt'
   DOWNLOADED_TEST_FILE_NAME = 'downloaded test file.txt'
   COMMENT_MESSAGE = 'this is a comment'
   REPLY_MESSAGE = 'this is a comment reply'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boxr
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Chad Burnette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-15 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler