box-api 0.1.8 → 0.1.9

data/Gemfile.lock

@@ -1,24 +1,26 @@
 PATH
   remote: .
   specs:
-    box-api (0.1.8)
-      httmultiparty (~> 0.3)
+    box-api (0.1.9)
+      httmultiparty (~> 0.3.6)
 
 GEM
   remote: http://rubygems.org/
   specs:
     configuration (1.3.1)
-    crack (0.1.8)
     diff-lcs (1.1.2)
-    httmultiparty (0.3)
+    httmultiparty (0.3.6)
       httparty (>= 0.7.3)
       multipart-post
-    httparty (0.7.8)
-      crack (= 0.1.8)
+    httparty (0.8.1)
+      multi_json
+      multi_xml
     launchy (0.4.0)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
-    multipart-post (1.1.2)
+    multi_json (1.0.3)
+    multi_xml (0.4.1)
+    multipart-post (1.1.3)
     rake (0.9.2)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)

data/box-api.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "box-api"
-  s.version     = "0.1.8"
+  s.version     = "0.1.9"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Box.net", "Luke Curley"]
   s.email       = ["luke@box.net"]
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = [ "lib", "spec" ]
 
-  s.add_dependency("httmultiparty", "~> 0.3")
+  s.add_dependency("httmultiparty", "~> 0.3.6")
 
   s.add_development_dependency("launchy") # only used in examples
   s.add_development_dependency("rake")

data/lib/box/api.rb

@@ -271,20 +271,22 @@ module Box
 
     # Upload the file to the specified folder.
     #
-    # @param [String] path Upload the file at the given path.
+    # @param [String, File or UploadIO] path Upload the file at the given path, or a File or UploadIO object..
     # @param [String] folder_id The folder id of the parent folder to use.
     # @param [Optional, Boolean] new_copy Upload a new copy instead of overwriting.
     def upload(path, folder_id, new_copy = false)
-      query_upload('upload', folder_id, 'upload_ok', :file => ::File.new(path), :new_copy => new_copy)
+      path = ::File.new(path) unless path.is_a?(::UploadIO) or path.is_a?(::File)
+      query_upload('upload', folder_id, 'upload_ok', :file => path, :new_copy => new_copy)
     end
 
     # Overwrite the given file with a new one.
     #
-    # @param [String] path (see #upload)
+    # @param [String, File or UploadIO] path (see #upload)
     # @param [String] file_id Replace the file with this id.
     # @param [Optional, String] name Use a new name as well.
     def overwrite(path, file_id, name = nil)
-      query_upload('overwrite', file_id, 'upload_ok', :file => ::File.new(path), :file_name => name)
+      path = ::File.new(path) unless path.is_a?(::UploadIO) or path.is_a?(::File)
+      query_upload('overwrite', file_id, 'upload_ok', :file => path, :file_name => name)
     end
 
     # Upload a new copy of the given file.

data/spec/file_spec.rb

@@ -90,6 +90,22 @@ describe Box::File do
       clone.should_not be @dummy
     end
 
+    it "uploads a File object" do
+      @test_temp = @test_root.create('temp')
+      File.open(@vegetables) do |f|
+        @test_temp.upload(f)
+      end
+      @test_temp.files.should have(1).things
+    end
+
+    it "uploads an UploadIO object" do
+      @test_temp = @test_root.create('temp2')
+      File.open(@vegetables) do |f|
+        @test_temp.upload(UploadIO.new(f, 'text/plain', 'i_am_only_a_uploadio.txt'))
+      end
+      @test_temp.files.should have(1).things
+    end
+
     it "renames a file" do
       @dummy.rename('bandito.txt')
       @dummy.name.should == 'bandito.txt'

metadata

@@ -2,7 +2,7 @@
 name: box-api
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Box.net
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-15 00:00:00 -07:00
+date: 2011-10-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.3"
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -146,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2606524952571599279
+      hash: 3045908204068535320
       segments: 
       - 0
       version: "0"
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2606524952571599279
+      hash: 3045908204068535320
       segments: 
       - 0
       version: "0"