dbox 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/dbox.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dbox}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Ken Pratt}]

data/lib/dbox.rb

@@ -7,6 +7,7 @@ require "fileutils"
 require "time"
 require "yaml"
 require "logger"
+require "cgi"
 
 require "dbox/loggable"
 require "dbox/api"

data/lib/dbox/api.rb

@@ -48,9 +48,8 @@ module Dbox
     end
 
     def run(path)
-      path = escape_path(path)
       begin
-        res = yield path
+        res = yield
         case res
         when Hash
           res
@@ -71,17 +70,17 @@ module Dbox
 
     def metadata(path = "/")
       log.debug "Fetching metadata for #{path}"
-      run(path) do |path|
-        @client.metadata(@conf["root"], path)
+      run(path) do
+        @client.metadata(@conf["root"], escape_path(path))
       end
     end
 
     def create_dir(path)
       log.info "Creating #{path}"
-      run(path) do |path|
+      run(path) do
         case res = @client.file_create_folder(@conf["root"], path)
         when Net::HTTPForbidden
-          raise RemoteAlreadyExists, "The directory at #{path} already exists"
+          raise RemoteAlreadyExists, "Either the directory at #{path} already exists, or it has invalid characters in the name"
         else
           res
         end
@@ -90,38 +89,37 @@ module Dbox
 
     def delete_dir(path)
       log.info "Deleting #{path}"
-      run(path) do |path|
+      run(path) do
         @client.file_delete(@conf["root"], path)
       end
     end
 
     def get_file(path)
       log.info "Downloading #{path}"
-      run(path) do |path|
-        @client.get_file(@conf["root"], path)
+      run(path) do
+        @client.get_file(@conf["root"], escape_path(path))
       end
     end
 
     def put_file(path, file_obj)
       log.info "Uploading #{path}"
-      run(path) do |path|
+      run(path) do
         dir = File.dirname(path)
         name = File.basename(path)
-        @client.put_file(@conf["root"], dir, name, file_obj)
+        @client.put_file(@conf["root"], escape_path(dir), name, file_obj)
       end
     end
 
     def delete_file(path)
       log.info "Deleting #{path}"
-      run(path) do |path|
+      run(path) do
         @client.file_delete(@conf["root"], path)
       end
     end
 
     def move(old_path, new_path)
       log.info "Moving #{old_path} to #{new_path}"
-      run(old_path) do |old_path|
-        new_path = escape_path(new_path)
+      run(old_path) do
         case res = @client.file_move(@conf["root"], old_path, new_path)
         when Net::HTTPBadRequest
           raise RemoteAlreadyExists, "Error during move -- there may already be a Dropbox folder at #{new_path}"
@@ -132,7 +130,7 @@ module Dbox
     end
 
     def escape_path(path)
-      URI.escape(path)
+      path.split("/").map {|s| CGI.escape(s).gsub("+", "%20") }.join("/")
     end
 
     def self.conf

data/lib/dbox/db.rb

@@ -322,9 +322,10 @@ module Dbox
         }
 
         if attrs["is_dir"] && list_contents
-          contents = Dir[File.join(full, "*")]
-          attrs["contents"] = contents.map do |f|
-            r = @db.local_to_relative_path(f)
+          contents = Dir.entries(full).reject {|s| s == "." || s == ".." }
+          attrs["contents"] = contents.map do |s|
+            p = File.join(full, s)
+            r = @db.local_to_relative_path(p)
             gather_info(r, false)
           end
         end

data/spec/dbox_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
 
 include FileUtils
@@ -181,6 +183,27 @@ describe Dbox do
       Dbox.push(@local).should eql(:created => ["subdir", "subdir/one.txt"], :deleted => ["foo.txt"], :updated => ["baz.txt"])
       Dbox.pull(@local).should eql(:created => [], :deleted => [], :updated => [])
     end
+
+    it "should be able to handle crazy filenames" do
+      Dbox.create(@remote, @local)
+      crazy_name1 = '=+!@#  $%^&*()[]{}<>_-|:?,\'~".txt'
+      crazy_name2 = '[ˈdɔʏtʃ].txt'
+      touch "#{@local}/#{crazy_name1}"
+      touch "#{@local}/#{crazy_name2}"
+      Dbox.push(@local).should eql(:created => [crazy_name1, crazy_name2], :deleted => [], :updated => [])
+      rm_rf @local
+      Dbox.clone(@remote, @local).should eql(:created => [crazy_name1, crazy_name2], :deleted => [], :updated => [])
+    end
+
+    it "should be able to handle directory names" do
+      Dbox.create(@remote, @local)
+      crazy_name1 = "Day[J] #42"
+      mkdir File.join(@local, crazy_name1)
+      touch File.join(@local, crazy_name1, "foo.txt")
+      Dbox.push(@local).should eql(:created => [crazy_name1, File.join(crazy_name1, "foo.txt")], :deleted => [], :updated => [])
+      rm_rf @local
+      Dbox.clone(@remote, @local).should eql(:created => [crazy_name1, File.join(crazy_name1, "foo.txt")], :deleted => [], :updated => [])
+    end
   end
 
   describe "#move" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dbox
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Ken Pratt