From a644d1fefa7794c192168644325c3ff86d6bc23d Mon Sep 17 00:00:00 2001
From: Tam + Dung <tam.vo@eastagile.com>
Date: Thu, 21 Jun 2012 15:38:06 +0700
Subject: [PATCH] Fix file_create_folder

---
 lib/dummy_dropbox_sdk.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/dummy_dropbox_sdk.rb b/lib/dummy_dropbox_sdk.rb
index 4dc69bf..9e7c3a1 100644
--- a/lib/dummy_dropbox_sdk.rb
+++ b/lib/dummy_dropbox_sdk.rb
@@ -70,30 +70,32 @@ def initialize(session, root="app_folder", locale=nil)
   end
 
   def file_create_folder(path, options={})
-    FileUtils.mkdir( "#{DummyDropbox::root_path}/#{path}" )
+    file_path = File.join(DummyDropbox::root_path, path)
+    raise DropboxError.new("Folder exists!") if File.exists?(file_path)
+    FileUtils.mkdir(file_path)
     # intercepted result:
     # {"modified"=>"Wed, 23 Nov 2011 10:24:37 +0000", "bytes"=>0, "size"=>"0
     # bytes", "is_dir"=>true, "rev"=>"2f04dc6147", "icon"=>"folder",
     # "root"=>"app_folder", "path"=>"/test_from_console", "thumb_exists"=>false,
     # "revision"=>47}
-    return self.metadata( path )
+    return self.metadata(path)
   end
 
   def metadata(path, options={})
-    dummy_path = "#{DummyDropbox::root_path}/#{path}"
+    dummy_path = File.join(DummyDropbox::root_path, path)
     raise DropboxError.new("File not found") unless File.exists?(dummy_path)
 
     list_hash_files = []
     if File.directory?(dummy_path)
       Dir.entries(dummy_path).each do |file_name|
-        file_path = "#{dummy_path}/#{file_name}"
+        file_path = File.join(dummy_path, file_name)
         unless File.directory?(file_path)
           list_hash_files << {"size" => readable_file_size(File.size(file_path), 2),
                               "bytes" => File.size(file_path),
                               "is_dir" => false,
                               "modified" => File.mtime(file_path),
                               "mime_type" => MIME::Types.type_for(file_path)[0].content_type,
-                              "path" => "#{path}/#{file_name}"}
+                              "path" => File.join(path, file_name)}
         end
       end