dropbox-api 0.2.0 → 0.2.1

data/lib/dropbox-api/client.rb

@@ -30,6 +30,8 @@ module Dropbox
       end
 
       def mkdir(path)
+        # Remove the characters not allowed by Dropbox
+        path = path.gsub(/[\\\:\?\*\<\>\"\|]+/, '')
         response = raw.create_folder :path => path
         Dropbox::API::Dir.init(response, self)
       end

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

@@ -7,6 +7,7 @@ module Dropbox
 
         def download(path, options = {})
           root     = options.delete(:root) || Dropbox::API::Config.mode
+          path     = Dropbox::API::Util.escape(path)
           url      = ['', "files", root, path].compact.join('/')
           connection.get_raw(:content, url)
         end
@@ -14,6 +15,7 @@ module Dropbox
         def upload(path, data, options = {})
           root     = options.delete(:root) || Dropbox::API::Config.mode
           query    = Dropbox::API::Util.query(options)
+          path     = Dropbox::API::Util.escape(path)
           url      = ['', "files_put", root, path].compact.join('/')
           response = connection.put(:content, "#{url}?#{query}", data, {
             'Content-Type'   => "application/octet-stream",

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

@@ -22,7 +22,7 @@ module Dropbox
 
       def request(endpoint, method, action, data = {})
         action.sub! ':root', data.delete(:root) if action.match ':root'
-        action.sub! ':path', data.delete(:path) if action.match ':path'
+        action.sub! ':path', Dropbox::API::Util.escape(data.delete(:path)) if action.match ':path'
         connection.send(method, endpoint, action, data)
       end
 

data/lib/dropbox-api/connection/requests.rb

@@ -29,29 +29,31 @@ module Dropbox
           end
         end
 
+
+
         def get_raw(endpoint, path, data = {}, headers = {})
           query = Dropbox::API::Util.query(data)
           request(:raw => true) do
-            token(endpoint).get "#{Dropbox::API::Config.prefix}#{URI.parse(URI.encode(path))}?#{URI.parse(URI.encode(query))}", headers
+            token(endpoint).get "#{Dropbox::API::Config.prefix}#{path}?#{URI.parse(URI.encode(query))}", headers
           end
         end
 
         def get(endpoint, path, data = {}, headers = {})
           query = Dropbox::API::Util.query(data)
           request do
-            token(endpoint).get "#{Dropbox::API::Config.prefix}#{URI.parse(URI.encode(path))}?#{URI.parse(URI.encode(query))}", headers
+            token(endpoint).get "#{Dropbox::API::Config.prefix}#{path}?#{URI.parse(URI.encode(query))}", headers
           end
         end
 
         def post(endpoint, path, data = {}, headers = {})
           request do
-            token(endpoint).post "#{Dropbox::API::Config.prefix}#{URI.parse(URI.encode(path))}", data, headers
+            token(endpoint).post "#{Dropbox::API::Config.prefix}#{path}", data, headers
           end
         end
 
         def put(endpoint, path, data = {}, headers = {})
           request do
-            token(endpoint).put "#{Dropbox::API::Config.prefix}#{URI.parse(URI.encode(path))}", data, headers
+            token(endpoint).put "#{Dropbox::API::Config.prefix}#{path}", data, headers
           end
         end
 

data/lib/dropbox-api/util/util.rb

@@ -5,6 +5,12 @@ module Dropbox
 
       class << self
 
+        def escape(string)
+          string.gsub(/([^ a-zA-Z0-9\.\\\-\/\_]+)/) do
+            '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
+          end.gsub(' ', '%20')
+        end
+
         def query(data)
           data.inject([]) { |memo, entry| memo.push(entry.join('=')); memo }.join('&')
         end

data/lib/dropbox-api/version.rb

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

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "spec_helper"
 
 describe Dropbox::API::Client do
@@ -49,6 +50,20 @@ describe Dropbox::API::Client do
       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}"
+      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}"
+      response = @client.mkdir dirname
+      response.path.should == dirname
+      response.should be_an_instance_of(Dropbox::API::Dir)
+    end
+
   end
 
   describe "#upload" do
@@ -60,6 +75,19 @@ describe Dropbox::API::Client do
       response.bytes.should == 9
     end
 
+    it "uploads the file with tricky characters" do
+      filename = "test/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"
+      response = @client.upload filename, "Some file"
+      response.path.should == filename
+      response.bytes.should == 9
+    end
   end
 
   describe "#search" do
@@ -77,6 +105,7 @@ describe Dropbox::API::Client do
   describe "#download" do
 
     it "downloads a file from Dropbox" do
+      @client.upload 'test/test.txt', "Some file"
       file = @client.download 'test/test.txt'
       file.should == "Some file"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dropbox-api
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-19 00:00:00.000000000 Z
+date: 2012-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70348446258240 !ruby/object:Gem::Requirement
+  requirement: &70337833527400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348446258240
+  version_requirements: *70337833527400
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70348446257500 !ruby/object:Gem::Requirement
+  requirement: &70337833526700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348446257500
+  version_requirements: *70337833526700
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70348446257040 !ruby/object:Gem::Requirement
+  requirement: &70337833526140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348446257040
+  version_requirements: *70337833526140
 description: To deliver a more Rubyesque experience when using the DropBox API.
 email:
 - marcin@futuresimple.com
@@ -121,3 +121,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/config.rb
 - spec/support/jpeg.rb
+has_rdoc: