dropbox-api 0.2.1 → 0.2.2

data/dropbox-api.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Dropbox::API::VERSION
   s.authors     = ["Marcin Bunsch"]
   s.email       = ["marcin@futuresimple.com"]
-  s.homepage    = ""
+  s.homepage    = "http://github.com/futuresimple/dropbox-api"
   s.summary     = "A Ruby client for the DropBox REST API."
   s.description = "To deliver a more Rubyesque experience when using the DropBox API."
 

data/lib/dropbox-api/client.rb

@@ -18,7 +18,9 @@ module Dropbox
       include Dropbox::API::Client::Files
 
       def find(filename)
-        ls(filename).first
+        data = self.raw.metadata(:path => filename)
+        data.delete('contents')
+        Dropbox::API::Object.convert(data, self)
       end
 
       def ls(path = '')
@@ -42,6 +44,11 @@ module Dropbox
         Dropbox::API::Object.convert(results, self)
       end
 
+      def delta(cursor = nil, options = {})
+        response = cursor ? raw.delta({ :cursor => cursor }.merge(options)) : raw.delta(options)
+        Dropbox::API::Object.init(response, self)
+      end
+
     end
 
   end

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

@@ -24,6 +24,10 @@ module Dropbox
           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 }.merge(options))
+        end
+
       end
 
     end

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

@@ -11,7 +11,7 @@ module Dropbox
 
       def self.add_method(method, action, options = {})
         # Add the default root bit, but allow it to be disabled by a config option
-        root = options[:root] == false ? '' : "options[:root] ||= '#{Dropbox::API::Config.mode}'"
+        root = options[:root] == false ? '' : "options[:root] ||= Dropbox::API::Config.mode"
         self.class_eval <<-STR
           def #{options[:as] || action}(options = {})
             #{root}
@@ -29,6 +29,7 @@ module Dropbox
       add_method :get,  "/account/info",           :as => 'account', :root => false
 
       add_method :get,  "/metadata/:root/:path",   :as => 'metadata'
+      add_method :post, "/delta",                  :as => 'delta', :root => false
       add_method :get,  "/revisions/:root/:path",  :as => 'revisions'
       add_method :post, "/restore/:root/:path",    :as => 'restore'
       add_method :get,  "/search/:root/:path",     :as => 'search'
@@ -38,6 +39,7 @@ module Dropbox
       add_method :get_raw, "/thumbnails/:root/:path", :as => 'thumbnails', :endpoint => :content
 
       add_method :post, "/fileops/copy",           :as => "copy"
+      add_method :get,  "/copy_ref/:root/:path",   :as => 'copy_ref'
       add_method :post, "/fileops/create_folder",  :as => "create_folder"
       add_method :post, "/fileops/delete",         :as => "delete"
       add_method :post, "/fileops/move",           :as => "move"

data/lib/dropbox-api/objects/file.rb

@@ -28,7 +28,12 @@ module Dropbox
       def thumbnail(options = {})
         client.raw.thumbnails({ :path => self.path }.merge(options))
       end
-
+      
+      def copy_ref(options = {})
+        response = client.raw.copy_ref({ :path => self.path }.merge(options))
+        Dropbox::API::Object.init(response, client)
+      end
+      
       def download
         client.download(self.path)
       end

data/lib/dropbox-api/tasks.rb

@@ -33,9 +33,9 @@ module Dropbox
             access_token  = request_token.get_access_token(:oauth_verifier => token)
 
             puts "\nAuthorization complete!:\n\n"
-            puts "  Dropbox::Api::Config.app_key    = '#{consumer.key}'"
-            puts "  Dropbox::Api::Config.app_secret = '#{consumer.secret}'"
-            puts "  client = Dropbox::Api::Client.new(:token  => '#{access_token.token}', :secret => '#{access_token.secret}')"
+            puts "  Dropbox::API::Config.app_key    = '#{consumer.key}'"
+            puts "  Dropbox::API::Config.app_secret = '#{consumer.secret}'"
+            puts "  client = Dropbox::API::Client.new(:token  => '#{access_token.token}', :secret => '#{access_token.secret}')"
             puts "\n"
           end
         end

data/lib/dropbox-api/version.rb

@@ -1,5 +1,5 @@
 module Dropbox
   module API
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/spec/connection.sample.yml

@@ -1,4 +1,5 @@
 app_key:    # CONSUMER KEY
 app_secret: # CONSUMER SECRET
 token:      # ACCESS TOKEN
-secret:     # ACCESS SECRET
+secret:     # ACCESS SECRET
+mode:       # 'sandbox' or 'dropbox'

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

@@ -25,6 +25,30 @@ describe Dropbox::API::Client do
 
   end
 
+  describe "#find" do
+
+    before do
+      @filename = "#{Dropbox::Spec.test_dir}/spec-find-file-test-#{Time.now.to_i}.txt"
+      @file = @client.upload @filename, "spec file"
+
+      @dirname = "#{Dropbox::Spec.test_dir}/spec-find-dir-test-#{Time.now.to_i}"
+      @dir = @client.mkdir @dirname
+    end
+
+    it "returns a single file" do
+      response = @client.find(@filename)
+      response.path.should == @file.path
+      response.should be_an_instance_of(Dropbox::API::File)
+    end
+
+    it "returns a single directory" do
+      response = @client.find(@dirname)
+      response.path.should == @dir.path
+      response.should be_an_instance_of(Dropbox::API::Dir)
+    end
+
+  end
+
   describe "#ls" do
 
     it "returns an array of files and dirs" do
@@ -33,7 +57,7 @@ describe Dropbox::API::Client do
     end
 
     it "returns a single item array of if we ls a file" do
-      result     = @client.ls
+      result     = @client.ls(Dropbox::Spec.test_dir)
       first_file = result.detect { |f| f.class == Dropbox::API::File }
       result     = @client.ls first_file.path
       result.should be_an_instance_of(Array)
@@ -44,21 +68,21 @@ describe Dropbox::API::Client do
   describe "#mkdir" do
 
     it "returns an array of files and dirs" do
-      dirname  = "test/test-dir-#{Dropbox::Spec.namespace}"
+      dirname  = "#{Dropbox::Spec.test_dir}/test-dir-#{Dropbox::Spec.namespace}"
       response = @client.mkdir dirname
       response.path.should == dirname
       response.should be_an_instance_of(Dropbox::API::Dir)
     end
 
     it "creates dirs with tricky characters" do
-      dirname  = "test/test-dir |!@\#$%^&*{b}[].;'.,<>?: #{Dropbox::Spec.namespace}"
+      dirname  = "#{Dropbox::Spec.test_dir}/test-dir |!@\#$%^&*{b}[].;'.,<>?: #{Dropbox::Spec.namespace}"
       response = @client.mkdir dirname
       response.path.should == dirname.gsub(/[\\\:\?\*\<\>\"\|]+/, '')
       response.should be_an_instance_of(Dropbox::API::Dir)
     end
 
     it "creates dirs with utf8 characters" do
-      dirname  = "test/test-dir łółą #{Dropbox::Spec.namespace}"
+      dirname  = "#{Dropbox::Spec.test_dir}/test-dir łółą #{Dropbox::Spec.namespace}"
       response = @client.mkdir dirname
       response.path.should == dirname
       response.should be_an_instance_of(Dropbox::API::Dir)
@@ -69,21 +93,21 @@ describe Dropbox::API::Client do
   describe "#upload" do
 
     it "puts the file in dropbox" do
-      filename = "test/test-#{Dropbox::Spec.namespace}.txt"
+      filename = "#{Dropbox::Spec.test_dir}/test-#{Dropbox::Spec.namespace}.txt"
       response = @client.upload filename, "Some file"
       response.path.should == filename
       response.bytes.should == 9
     end
 
     it "uploads the file with tricky characters" do
-      filename = "test/test ,|!@\#$%^&*{b}[].;'.,<>?:-#{Dropbox::Spec.namespace}.txt"
+      filename = "#{Dropbox::Spec.test_dir}/test ,|!@\#$%^&*{b}[].;'.,<>?:-#{Dropbox::Spec.namespace}.txt"
       response = @client.upload filename, "Some file"
       response.path.should == filename
       response.bytes.should == 9
     end
 
     it "uploads the file with utf8" do
-      filename = "test/test łołąó-#{Dropbox::Spec.namespace}.txt"
+      filename = "#{Dropbox::Spec.test_dir}/test łołąó-#{Dropbox::Spec.namespace}.txt"
       response = @client.upload filename, "Some file"
       response.path.should == filename
       response.bytes.should == 9
@@ -93,26 +117,54 @@ describe Dropbox::API::Client do
   describe "#search" do
 
     it "finds a file" do
+      filename = "#{Dropbox::Spec.test_dir}/searchable-test-#{Dropbox::Spec.namespace}.txt"
+      @client.upload filename, "Some file"
+      response = @client.search "searchable-test-#{Dropbox::Spec.namespace}", :path => "#{Dropbox::Spec.test_dir}"
+      response.size.should == 1
+      response.first.class.should == Dropbox::API::File
+    end
+
+  end
+
+  describe "#copy_from_copy_ref" do
+
+    it "copies a file from a copy_ref" do
       filename = "test/searchable-test-#{Dropbox::Spec.namespace}.txt"
       @client.upload filename, "Some file"
-      response = @client.search "searchable-test-#{Dropbox::Spec.namespace}", :path => 'test'
+      response = @client.search "searchable-test-#{Dropbox::Spec.namespace}", :path => 'test'      
+      ref = response.first.copy_ref['copy_ref']
+      @client.copy_from_copy_ref ref, "#{filename}.copied"
+      response = @client.search "searchable-test-#{Dropbox::Spec.namespace}.txt.copied", :path => 'test'   
       response.size.should == 1
       response.first.class.should == Dropbox::API::File
     end
 
   end
 
+  describe "#delta" do
+
+    it "receives an object with a cursor and list of entries" do
+      filename = "test/delta-test-#{Dropbox::Spec.namespace}.txt"
+      @client.upload filename, "Some file"
+      response = @client.delta
+      response.cursor.should_not be_nil
+      response.entries.should_not be_nil
+      response.should be_an_instance_of(Dropbox::API::Object)
+    end
+
+  end
+
   describe "#download" do
 
     it "downloads a file from Dropbox" do
-      @client.upload 'test/test.txt', "Some file"
-      file = @client.download 'test/test.txt'
+      @client.upload "#{Dropbox::Spec.test_dir}/test.txt", "Some file"
+      file = @client.download "#{Dropbox::Spec.test_dir}/test.txt"
       file.should == "Some file"
     end
 
     it "raises a 404 when a file is not found in Dropbox" do
       lambda {
-        @client.download 'test/no.txt'
+        @client.download "#{Dropbox::Spec.test_dir}/no.txt"
       }.should raise_error(Dropbox::API::Error::NotFound)
     end
 

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

@@ -4,7 +4,7 @@ describe Dropbox::API::Dir do
 
   before do
     @client = Dropbox::Spec.instance
-    @dirname = "test/spec-dir-test-#{Time.now.to_i}"
+    @dirname = "#{Dropbox::Spec.test_dir}/spec-dir-test-#{Time.now.to_i}"
     @dir = @client.mkdir @dirname
   end
 

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

@@ -4,7 +4,7 @@ describe Dropbox::API::File do
 
   before do
     @client = Dropbox::Spec.instance
-    @filename = "test/spec-test-#{Time.now.to_i}.txt"
+    @filename = "#{Dropbox::Spec.test_dir}/spec-test-#{Time.now.to_i}.txt"
     @file = @client.upload @filename, "spec file"
   end
 
@@ -21,7 +21,7 @@ describe Dropbox::API::File do
     end
 
   end
-
+  
   describe "#move" do
 
     it "moves the file properly" do
@@ -91,6 +91,18 @@ describe Dropbox::API::File do
 
   end
 
+  describe "#copy_ref" do
+    
+    it "returns a copy_ref object" do
+      
+      result = @file.copy_ref
+      result.should be_an_instance_of(Dropbox::API::Object)
+      result.keys.sort.should == ['copy_ref', 'expires']
+      
+    end
+    
+  end
+
   describe "#direct_url" do
 
     it "returns an Url object" do

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

@@ -6,7 +6,7 @@ describe Dropbox::API::File do
   before do
     @io       = StringIO.new
     @client   = Dropbox::Spec.instance
-    @filename = "test/spec-test-#{Time.now.to_i}.jpg"
+    @filename = "#{Dropbox::Spec.test_dir}/spec-test-#{Time.now.to_i}.jpg"
     jpeg      = File.read("spec/fixtures/dropbox.jpg")
     @file     = @client.upload @filename, jpeg
   end

data/spec/spec_helper.rb

@@ -12,3 +12,12 @@ module Dropbox
 end
 
 Dir.glob("#{File.dirname(__FILE__)}/support/*.rb").each { |f| require f }
+
+# Clean up after specs, remove test-directory
+RSpec.configure do |config|
+  config.after(:all) do
+    test_dir = Dropbox::Spec.instance.find(Dropbox::Spec.test_dir)
+    test_dir.destroy unless test_dir.is_deleted?
+  end
+end
+

data/spec/support/config.rb

@@ -4,6 +4,7 @@ config = YAML.load_file "spec/connection.yml"
 
 Dropbox::API::Config.app_key    = config['app_key']
 Dropbox::API::Config.app_secret = config['app_secret']
+Dropbox::API::Config.mode       = config['mode']
 
 Dropbox::Spec.token  = config['token']
 Dropbox::Spec.secret = config['secret']
@@ -11,3 +12,4 @@ Dropbox::Spec.secret = config['secret']
 Dropbox::Spec.namespace = Time.now.to_i
 Dropbox::Spec.instance  = Dropbox::API::Client.new(:token  => Dropbox::Spec.token,
                                                    :secret => Dropbox::Spec.secret)
+Dropbox::Spec.test_dir = "test-#{Time.now.to_i}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dropbox-api
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-24 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70337833527400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70337833527400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70337833526700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70337833526700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70337833526140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70337833526140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: To deliver a more Rubyesque experience when using the DropBox API.
 email:
 - marcin@futuresimple.com
@@ -85,7 +100,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/config.rb
 - spec/support/jpeg.rb
-homepage: ''
+homepage: http://github.com/futuresimple/dropbox-api
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -105,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dropbox-api
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Ruby client for the DropBox REST API.