dropbox-api 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a497d50d7c10eb7ace7e89beffe53806096d7e7
-  data.tar.gz: 638bebfaa0400f030068dcc07d8549fbea9d284e
+  metadata.gz: 479b56344f30f924e5356feb539d00639397d4bd
+  data.tar.gz: cc4e16ab4d6507626469ab4172cf1860d7d9888b
 SHA512:
-  metadata.gz: 9d62dc7f4c700a210e9853ee2919db1bbab97224ca2ae7a512b095199e1a93e08a1057cb3c6c46e48b57044bb251567bdb95e446d2a26222ec7c8cb020f81822
-  data.tar.gz: 0b91edbe79fb4e0bab7d4af3d849b5f785b49758196ff9b89dad14c19eb995b452202daeb32827e45c85669a68391315cce833b3a71ba281a21efe3a80177356
+  metadata.gz: 4dc5213599843a81ad89b47842a1298063150d9e658e543df9bc5641bd1678319bcdb796ff51caeba33fb849b264a45ee5372b7a4fb4990634a1f7afc07bb1cb
+  data.tar.gz: 059424661b5c12a9263a6f828c192dffaa8fe35cc13b41a438a8d9da8e04aa7dc0296c74f874da61f271d66cb34e6a3d60c4ae2afb0604dd8a2674b4d839a79a

data/CHANGELOG

@@ -1,3 +1,5 @@
+0.4.5
++ Add Dropbox::API::Client#chunked_upload
 0.4.4
 + Add Dropbox::API::Dir#hash which returns the dropbox hash
 0.4.3

data/lib/dropbox-api/client.rb

@@ -18,8 +18,7 @@ module Dropbox
       include Dropbox::API::Client::Files
 
       def find(filename)
-        data = self.raw.metadata(:path => filename)
-        data.delete('contents')
+        data = self.raw.metadata(:path => filename, :list => false)
         Dropbox::API::Object.convert(data, self)
       end
 

data/lib/dropbox-api/client/files.rb

@@ -24,10 +24,47 @@ module Dropbox
           Dropbox::API::File.init(response, self)
         end
 
+        def chunked_upload(path, file, options = {})
+          root     = options.delete(:root) || Dropbox::API::Config.mode
+          path     = Dropbox::API::Util.escape(path)
+          upload_url = '/chunked_upload'
+          commit_url = ['', "commit_chunked_upload", root, path].compact.join('/')
+
+          total_file_size = ::File.size(file)
+          chunk_size = options[:chunk_size] || 4*1024*1024 # default 4 MB chunk size
+          offset = options[:offset] || 0
+          upload_id = options[:upload_id]
+
+          while offset < total_file_size
+            data = file.read(chunk_size)
+
+            query    = Dropbox::API::Util.query(options.merge(:offset => offset))
+            response = connection.put(:content, "#{upload_url}?#{query}", data, {
+              'Content-Type'   => "application/octet-stream",
+              "Content-Length" => data.length.to_s
+            })
+
+            upload = Dropbox::API::Object.init(response, self)
+            options[:upload_id] ||= upload[:upload_id]
+            offset += upload[:offset].to_i - offset if upload[:offset] && upload[:offset].to_i > offset
+            yield offset, upload if block_given?
+          end
+
+
+          query = Dropbox::API::Util.query({:upload_id => options[:upload_id]})
+
+          response = connection.post(:content, "#{commit_url}?#{query}", "", {
+            'Content-Type'   => "application/octet-stream",
+            "Content-Length" => "0"
+          })
+
+          Dropbox::API::File.init(response, self)
+        end
+
         def copy_from_copy_ref(copy_ref, to, options = {})
-          raw.copy({ 
-            :from_copy_ref => copy_ref, 
-            :to_path => to 
+          raw.copy({
+            :from_copy_ref => copy_ref,
+            :to_path => to
           }.merge(options))
         end
 

data/lib/dropbox-api/version.rb

@@ -1,5 +1,5 @@
 module Dropbox
   module API
-    VERSION = "0.4.4"
+    VERSION = "0.4.5"
   end
 end

data/spec/lib/dropbox-api/client_spec.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require "spec_helper"
+require "tempfile"
 
 describe Dropbox::API::Client do
 
@@ -114,6 +115,26 @@ describe Dropbox::API::Client do
     end
   end
 
+  describe "#chunked_upload" do
+
+    before do
+      @size = 5*1024*1024 # 5MB, to test the 4MB chunk size
+      @file = File.open("/tmp/dropbox-api-test", "w") {|f| f.write "a"*@size}
+    end
+
+    it "puts a 5MB file in dropbox" do
+      filename = "#{Dropbox::Spec.test_dir}/test-#{Dropbox::Spec.namespace}.txt"
+      response = @client.chunked_upload filename, File.open("/tmp/dropbox-api-test")
+      response.path.should == filename
+      response.bytes.should == @size
+    end
+
+    after do
+      FileUtils.rm "/tmp/dropbox-api-test"
+    end
+
+  end
+
   describe "#search" do
 
     let(:term) { "searchable-test-#{Dropbox::Spec.namespace}" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dropbox-api
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Marcin Bunsch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json