ruby-box 1.9.2 → 1.9.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGE5MjEyYWJjNzVmNmEwZTVjNjkxODVjNDVmNzUyYzExMDU3ZjJjYw==
+    ODE3OWJkYWM1ZTZkNzU5NjczZGU3Yzk5Y2I1MjZkNjhiZWI2OGIwZQ==
   data.tar.gz: !binary |-
-    YWFmYjlmNWQ2MmQ0YzE1YWZhZjgxOGMyYzA0NDQ3NDJjZDY4YjQwOA==
+    NzYxZjVkNWJiZDg2MDdiYTVmMmI5ZDg3MjQwZGIzNzNiMjRiNTQxYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjFlN2QzYWI5MDg5MThlYzljNzg5MDJlYjgyNzg0MDQ5MGU2YzUzOWU2NDdl
-    YmU0MWE5MWU1NDNlMzBmNjlmNzY0YzQ3NWIxYzA4NTNlNzQzYjM1ZGM4ZGU2
-    YjIxNGI5MTE4YmQwMjQxZTQ4NGM1OTI4Y2Q4YTk0MjYwZDhmNTk=
+    ZWU0ZjE0YzVjZmNiMGEyZmU3NmNiNWE2ZjRiMDlkYmIyNTY5Mjc2MTRhZTdm
+    NGE1NWMyZGYwNDM4MTRmZWI5ZmU5MTM4ZDYzZjQxMmJiZjBhOWQ0ODRiYjdh
+    NTVmNDE3OWZkNTlmZTJiZTA1NTU5MjQ2MzNkNmY0MWI5ZGYxNzc=
   data.tar.gz: !binary |-
-    YzExZWI2N2ZmYTQyNWU1YjVmZWFjZjZjN2MzOWFlNDc3MjZhOTBiNTMzMGY2
-    OGM1NDI4MGY3MGU0YjlkM2E4ZWExZWI2MzlhMTUxNWI5YTQ0NTA4NDRmMTc3
-    N2JkMDFlYzJmZTc3M2E5MDcyMzRiM2U5YWRhOGViZTNlM2U2Y2M=
+    MjVmYjNkMjQ4NmMyNmJlMDczZmY5YTQ5ODE1ZmY4MTExMTkwZWMyMWQ3ZGVm
+    MGRlZDlkZGJkMDM4ZDk1ZGJhZTI5ZmU4ZTk4ZDc3ZmEwOGZjYmM3YjYxYWQ1
+    MWIyM2Y1NDY5OTdjOWUwY2M2MzYwNWNhMzk1OWNhZWUyZjA3M2E=

data/VERSION

@@ -1 +1 @@
-1.9.2
+1.9.3

data/lib/ruby-box/client.rb

@@ -70,19 +70,19 @@ module RubyBox
       folder
     end
 
-    def upload_data(path, data)
+    def upload_data(path, data, overwrite=true)
       path = split_path(path)
       file_name = path.pop
       folder = create_folder(path.join('/'))
-      folder.upload_file(file_name, data) if folder
+      folder.upload_file(file_name, data, overwrite) if folder
     end
 
-    def upload_file(local_path, remote_path)
+    def upload_file(local_path, remote_path, overwrite=true)
       file_name = local_path.split('/').pop
       folder = create_folder( remote_path )
       return unless folder
       ::File.open( local_path ) do |data|
-        folder.upload_file(file_name, data)
+        folder.upload_file(file_name, data, overwrite)
       end
     end
 

data/lib/ruby-box/folder.rb

@@ -13,7 +13,7 @@ module RubyBox
       items_by_type(RubyBox::Folder, name, item_limit, offset, fields)
     end
 
-    def upload_file(filename, data)
+    def upload_file(filename, data, overwrite=true)
       file = RubyBox::File.new(@session, {
         'name' => filename,
         'parent' => RubyBox::User.new(@session, {'id' => id})
@@ -22,6 +22,11 @@ module RubyBox
       begin
         resp = file.upload_content(data) #write a new file. If there is a conflict, update the conflicted file.
       rescue RubyBox::ItemNameInUse => e
+        
+        # if overwrite flag is false, simply raise exception.
+        raise e unless overwrite
+
+        # otherwise let's attempt to overwrite the file.
         data.rewind
 
         # The Box API occasionally does not return

data/ruby-box.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-box"
-  s.version = "1.9.2"
+  s.version = "1.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Attachments.me"]
-  s.date = "2013-08-05"
+  s.date = "2013-08-07"
   s.description = "ruby gem for box.com 2.0 api"
   s.email = "ben@attachments.me"
   s.extra_rdoc_files = [

data/spec/integration_spec.rb

@@ -123,6 +123,15 @@ describe RubyBox, :skip => true do
         file.name.should == '遠志教授.jpg'
         file.delete
       end
+
+      it 'should raise an exception if files collide and overwrite is false' do
+        fdata = File.open( 'spec/fixtures/遠志教授.jpg', 'rb' )
+        file = @client.upload_data('/ruby-box_gem_testing/cool stuff/遠志教授.jpg', fdata)
+        fdata = File.open( 'spec/fixtures/遠志教授.jpg', 'rb' )
+        
+        expect{ @client.upload_data('/ruby-box_gem_testing/cool stuff/遠志教授.jpg', fdata, false) }.to raise_error(RubyBox::ItemNameInUse)
+        file.delete
+      end
       
       it "should upload a new file" do
         utf8_file_name = '遠志教授.jpg'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-box
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Attachments.me
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post