boxr 0.26.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80bb5e98b518eb34aaaddc369a739111cb2bbcd1
-  data.tar.gz: 852abc3f680cf0e7e379c67e1fad79096c871d3a
+  metadata.gz: 93e44fc598ab6789018d63eaf7277ab1cd616138
+  data.tar.gz: a7bf8e2e7e8043ec2c48c818e3a2e4396de14816
 SHA512:
-  metadata.gz: eb43cff1678d67aaa57366a99bed71eed95babcaa3d608404c3362385d26e30e3d69d5a528f11e1ec752b1a3f83ce168c3da4c984f8bdbc65f9e44064540de61
-  data.tar.gz: 24926c43ccc5d4992168b231c97f68780732e5d502be9590f359107edf7c6cadf37171f76b4b9153397c42f8cfa1a6de026abd16067f6e90c1ae23ac8f5bcc15
+  metadata.gz: a23f74f3d18e47d704bc08f0ec9fa5d59d6d0ef245bac16bad986759915f51f28a834e7b2e2e06ca76986971e4c6225567a7b7c8ea05ff39eb2d9ace82e41585
+  data.tar.gz: 9356cbc841b364d9451652d9c609b6b2b428ab9c8da8f31aed3a6a3d3e17505129f1d8c15e96e999c131629a3077b80f6bf4f2d1263a8335c88d0333a0905748

data/lib/boxr/files.rb

@@ -93,22 +93,27 @@ module Boxr
       download_file(file, version: version, follow_redirect: false)
     end
 
-    def upload_file(path_to_file, parent, content_created_at: nil, content_modified_at: nil,
+    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)
-      preflight_check(path_to_file, parent_id) if preflight_check
+
+      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
-        
-        attributes = {filename: file, parent_id: parent_id}
+
+        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?
-        file_info, response = post(FILES_UPLOAD_URI, attributes, process_body: false, content_md5: content_md5)
+
+        body = {attributes: Oj.dump(attributes), file: file}
+
+        file_info, response = post(FILES_UPLOAD_URI, body, process_body: false, content_md5: content_md5)
       end
 
       file_info["entries"][0]
@@ -237,18 +242,17 @@ module Boxr
 
     private
 
-    def preflight_check(path_to_file, parent_id)
+    def preflight_check(path_to_file, filename, parent_id)
       size = File.size(path_to_file)
 
       #TODO: need to make sure that figuring out the filename from the path_to_file works for people using Windows
-      filename = File.basename(path_to_file)
-      attributes = {"name" => filename, "parent" => {"id" => "#{parent_id}"}, "size" => size}
+      attributes = {name: filename, parent: {id: "#{parent_id}"}, size: size}
       body_json, res = options("#{FILES_URI}/content", attributes)
     end
 
     def preflight_check_new_version_of_file(path_to_file, file_id)
       size = File.size(path_to_file)
-      attributes = {"size" => size}
+      attributes = {size: size}
       body_json, res = options("#{FILES_URI}/#{file_id}/content", attributes)
     end
 

data/lib/boxr/version.rb

@@ -1,3 +1,3 @@
 module Boxr
-  VERSION = "0.26.0"
+  VERSION = "0.27.0"
 end

data/spec/boxr_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Boxr::Client do
 
-  #PLEASE NOTE 
+  #PLEASE NOTE
   #This test is intentionally NOT a series of unit tests.  The goal is to smoke test the entire code base
   #against an actual Box account, making real calls to the Box API.  The Box API is subject to frequent
   #changes and it is not sufficient to mock responses as those responses will change over time.  Successfully
@@ -16,7 +16,7 @@ describe Boxr::Client do
   #follow the directions in .env.example to set up your BOX_DEVELOPER_TOKEN
   #keep in mind it is only valid for 60 minutes
   BOX_CLIENT = Boxr::Client.new #using ENV['BOX_DEVELOPER_TOKEN']
-  
+
   #uncomment this line to see the HTTP request and response debug info in the rspec output
   #Boxr::turn_on_debugging
 
@@ -25,6 +25,7 @@ describe Boxr::Client do
   SUB_FOLDER_NAME = 'sub_folder_1'
   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'
   DOWNLOADED_TEST_FILE_NAME = 'downloaded test file.txt'
   COMMENT_MESSAGE = 'this is a comment'
   REPLY_MESSAGE = 'this is a comment reply'
@@ -134,6 +135,10 @@ describe Boxr::Client do
     expect(new_file.name).to eq(TEST_FILE_NAME)
     test_file = new_file
 
+    puts "upload a file with custom name"
+    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 "get file using path"
     file = BOX_CLIENT.file_from_path("/#{TEST_FOLDER_NAME}/#{TEST_FILE_NAME}")
     expect(file.id).to eq(test_file.id)
@@ -236,7 +241,7 @@ describe Boxr::Client do
   end
 
   #rake spec SPEC_OPTS="-e \"invokes user operations"\"
-  it "invokes user operations" do 
+  it "invokes user operations" do
     puts "inspect current user"
     user = BOX_CLIENT.current_user
     expect(user.status).to eq('active')
@@ -253,7 +258,7 @@ describe Boxr::Client do
     expect(test_user).to_not be_nil
 
     #create user is tested in the before method
-    
+
     puts "update user"
     new_name = "Chuck Nevitt"
     user = BOX_CLIENT.update_user(@test_user, name: new_name)
@@ -340,7 +345,7 @@ describe Boxr::Client do
   end
 
   #rake spec SPEC_OPTS="-e \"invokes comment operations"\"
-  it "invokes comment operations" do 
+  it "invokes comment operations" do
     new_file = BOX_CLIENT.upload_file("./spec/test_files/#{TEST_FILE_NAME}", @test_folder)
     test_file = new_file
 
@@ -492,4 +497,4 @@ describe Boxr::Client do
     expect(results).to eq([])
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boxr
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Chad Burnette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler