rapidshare-ext 0.0.2 → 0.0.3

data/History.md

@@ -1,3 +1,19 @@
+## ver.0.0.3 2012-11-19
+
+* [added] Downloading files by absolute path
+* [added] File download url added to the return hash of file_info(). Url is represented by the :url key
+* [changed] Folder pathes now have leading slash
+* [fixed] Base gem download functional didn't work when use :save_as param because of API changes month ago
+* [changed] Integration file uploading test refactored
+
+It has began. We have the features as follows:
+
+* [added] Creating folders
+
+## ver.0.0.2 2012-11-18
+
+Technical release. No features, no bug fixes.
+
 ## ver.0.0.1 2012-11-17
 
 It has began. We have the features as follows:

data/README.md

@@ -65,7 +65,7 @@ So, if you want to invalidate the cache just call the above method with trailing
 api.folders_hierarchy!
 ```
 
-If folder tree is inconsistent (orphans are found) the Exception will be thrown. To automatically normalize the tree, call the method with :consistent flag:
+If folder tree is inconsistent (orphans are found, see next paragraph for details) the Exception will be thrown. To automatically normalize the tree, call the method with :consistent flag:
 ```ruby
 api.folders_hierarchy :consistent => true
 ```
@@ -79,25 +79,35 @@ tree = api.folders_hierarchy
 ```
 
 ### Orphans
-Ok, the Rapidshare has its common problem: orphan folders. What is this? For example we have the following directory tree:
+As mentioned before, the Rapidshare has its common problem: orphan folders.
+What does it mean? When you delete parent folder by its ID then it will be deleted without any of its child folders being deleted.
+For example, lets we have the basic directory tree:
 ```
 ROOT
 `-a  <- RS API allows us to delete JUST THIS folder, so hierarchy relation between folders will be lost and the folders "c" and "b" will become orphans
   `-b
     `-c
 ```
-Orphans is invisible in your File Manager on the Rapidshare web site, so you may want to hide data in that way (stupid idea)
-We can fix it by detecting all orphan folders and moving them to a specific folder:
+
+Orphan folders are invisible in your File Manager on the Rapidshare web site, so you may want to hide data in that way (stupid idea)
+
+So, the best way to delete directory tree without washing away its consistency is the following:
+```ruby
+api.remove_folder "/a"
+```
+
+Buy if you already have orphans in your account there is possible to fix them.
+The next method detects all orphan folders in your account and moves them to a specific folder:
 ```ruby
 move_orphans :to => "/"
 ```
 
-Or we can just kill'em all:
+Or we can just delete all of them (be careful):
 ```ruby
 remove_orphans!
 ```
 
-Get folder ID or path:
+Get the folder ID or path:
 ```ruby
 id = api.folder_id("/foo/bar") # <ID>
 api.folder_path(id) # "/foo/bar"
@@ -105,7 +115,28 @@ api.folder_path(id) # "/foo/bar"
 
 ### Files
 
-File uploading is simple now:
+Now you can download files in two ways: by HTTP url or by absolute path.
+
+By url, as it worked before:
+```ruby
+@rs.download "https://rapidshare.com/files/4226120320/upload_file_1.txt",
+  :downloads_dir => "/tmp",
+  :save_as => "file2.txt" # This doesn't work in the base rapidshare gem
+
+  # With a default local file name
+  @rs.download "https://rapidshare.com/files/4226120320/upload_file_1.txt",
+    :downloads_dir => "/tmp"
+```
+
+Download by the absolute path:
+```ruby
+@rs.download "/foo/bar/baz/upload_file_1.txt",
+  :downloads_dir => "/tmp"
+```
+
+For both first and second samples result will be the same
+
+File uploading became very simple now:
 ```ruby
 api.upload("/home/odiszapc/my_damn_cat.mov", :to => "/gallery/video", :as => "cat1.mov")
 # => {
@@ -116,8 +147,9 @@ api.upload("/home/odiszapc/my_damn_cat.mov", :to => "/gallery/video", :as => "ca
 #  :already_exists? => true/false # Does the file already exists within a specific folder, real uploading will not being performed in this case
 #}
 ```
+Destination folder will be created automatically.
 After uploading has been completed the file will be stored in a Rapidshare as "/gallery/video/cat1.mov"
-To get download url after uploading:
+You can easily get a download url after uploading:
 ```ruby
 result = api.upload("/home/odiszapc/my_damn_cat.mov", :to => "/gallery/video", :as => "cat1.mov")
 result[:url]
@@ -130,7 +162,7 @@ api.upload("/home/odiszapc/my_damn_humster.mov")
 
 Deleting files:
 ```ruby
-api.remove_file("/putin/is/a/good/reason/to/live/abroad/ticket_to_Nikaragua.jpg")
+api.remove_file("/putin/is/a/good/reason/to/live/abroad/ticket_to_Nicaragua.jpg")
 ```
 
 Renaming files:
@@ -144,13 +176,13 @@ api.move_file("/foo/bar/baz.rar", :to => "/foo") # new file path: "/foo/baz.rar"
 api.move_file("/foo/bar/baz.rar") # move to a root folder
 ```
 
-Get file ID:
+Get the file ID:
 ```ruby
 api.file_id("/foo/bar/baz.rar") # => <ID>
 ```
 
 ### Account
-You can null your account by deleting all data involved. Be carefull with it, all data will be lost:
+You can null your account by deleting all data stored inside. Be careful with it, because all you los all your data:
 ```ruby
 api.erase_all_data!
 ```

data/lib/rapidshare-base/api.rb

@@ -57,5 +57,15 @@ module Rapidshare
 
         self.parse_response(parser, response)
       end
+
+      def download(file, params= {})
+        if file.match /\Ahttps?:\/\//
+          url = file
+        else
+          url = file_info(file)[:url]
+        end
+
+        Rapidshare::Ext::Download.new(url, self, params).perform
+      end
   end
 end

data/lib/rapidshare-ext/api.rb

@@ -12,6 +12,8 @@ module Rapidshare
       #
       #    api.add_folder("/a/b/c") #=> <Random folder ID from Rapidshare>, 1234 for example
       def add_folder(path, params = {})
+        path = path_trim path
+
         @tree = folders_hierarchy
         i = 1
         parent = 0
@@ -36,7 +38,7 @@ module Rapidshare
             @tree[folder_id] = {
               :parent => parent,
               :name => folder_name,
-              :path => (@tree[parent] || {})[:path].to_s + ('/' if @tree[parent]).to_s + folder_name
+              :path => path_canonize((@tree[parent] || {})[:path].to_s + ('/' if @tree[parent]).to_s + folder_name)
             }
             parent = folder_id
             path == base_path + '/' + folder_name
@@ -86,7 +88,7 @@ module Rapidshare
       #
       #    api.move_folder("/a/b/c", :to => "/a")
       def move_folder(source_path, params = {})
-        dest_path = path_trim(params.delete(:to) || '/')
+        dest_path = (params.delete(:to) || '/')
         source_folder_id = folder_id(source_path)
         dest_folder_id = folder_id(dest_path)
 
@@ -99,7 +101,7 @@ module Rapidshare
 
         @tree = folders_hierarchy
         @tree[source_folder_id][:parent] = dest_folder_id
-        @tree[source_folder_id][:path] = "#{folder_path(dest_folder_id)}/#{@tree[source_folder_id][:name]}"
+        @tree[source_folder_id][:path] = path_canonize "#{folder_path(dest_folder_id)}/#{@tree[source_folder_id][:name]}"
         true
       end
 
@@ -261,6 +263,7 @@ module Rapidshare
         end
 
         return @tree if @tree && !force_load # TODO: about slices here (:from parameter)
+        @tree = {}
 
         from_folder_id = folder_id from_folder_path
         raise Exception, "Folder #{from_folder_path} could not be found" if from_folder_id.nil?
@@ -322,12 +325,12 @@ module Rapidshare
         unless from_folder_path == ''
 
           result_tree.keep_if do |folder_id, data|
-            data[:path].start_with? "#{from_folder_path}/"
+            path_trim(data[:path]).start_with? "#{from_folder_path}/"
           end
 
           result_tree.each_pair do |folder_id, data|
             path = result_tree[folder_id][:path]
-            result_tree[folder_id][:path] = path.gsub /#{from_folder_path.gsub /\//, '\/'}\//, ''
+            result_tree[folder_id][:path] = path_canonize path_trim(path.gsub /#{from_folder_path.gsub /\//, '\/'}\//, '')
           end
         end
 
@@ -416,7 +419,8 @@ module Rapidshare
       def folder_path(folder_id)
         @tree = folders_hierarchy
         parent_id = @tree[folder_id][:parent]
-        (folder_path(parent_id) if parent_id.nonzero?).to_s + ('/' if parent_id.nonzero?).to_s + @tree[folder_id][:name]
+        path = (folder_path(parent_id) if parent_id.nonzero?).to_s + ('/' if parent_id.nonzero?).to_s + @tree[folder_id][:name]
+        parent_id.zero? ? "/#{path}" : path
       end
 
       # Get folder ID by path
@@ -428,7 +432,7 @@ module Rapidshare
 
         @tree = folders_hierarchy
         index = @tree.find_index do |folder_id, data|
-          data[:path] == folder_path
+          path_trim(data[:path]) == path_trim(folder_path)
         end
         @tree.keys[index] unless index.nil?
       end
@@ -477,12 +481,14 @@ module Rapidshare
           response[value.to_sym] = resp[index]
         end
 
+        response[:url] = "https://rapidshare.com/files/#{response[:id]}/#{URI::encode response[:filename]}" if response[:filename]
+
         response
       end
 
-      # Get file ID by absolute path
+      # Returns file ID by absolute path
       #
-      #    api.file_id("foo/bar/baz/file.rar") # -> 456
+      #    api.file_id("foo/bar/baz/file.rar") # => <FILE_ID>
       def file_id(file_path, params = {})
         params[:fields] = ""
         file_info = file_info file_path, params
@@ -494,6 +500,10 @@ module Rapidshare
       def path_trim(path)
         path.gsub(/\A\/+/, '').gsub(/\/+\Z/, '')
       end
+
+      def path_canonize(path)
+        "/" + path_trim(path)
+      end
     end
   end
 end

data/lib/rapidshare-ext/download.rb

@@ -0,0 +1,47 @@
+module Rapidshare
+  module Ext
+
+    # Note from odiszapc:
+    #
+    # 1 oct 2012 the Rapidshare download API (http://images.rapidshare.com/apidoc.txt) was changed
+    # so the base download function provided by rapidshare gem became broken
+    #
+    # In the original method the parameter :filename being interpreted incorrectly now.
+    # It's being interpreted like a "save file as" parameter. Actually it must be equal to the file name you want to download
+    # So, to download file now you must specify exactly two parameters: file id and file name.
+    class Download < Rapidshare::Download
+
+      # Options:
+      # * *filename* (optional) - specifies filename under which the file will be
+      #   saved. Default: filename parsed from Rapidshare link.
+      # * *downloads_dir* (optional) - specifies directory into which downloaded files
+      #   will be saved. Default: current directory.
+      #
+      def initialize(url, api, options = {})
+        super
+        @local_filename = options[:save_as]
+        @filename = nil # It will be filled automatically by the #check method of the base class
+      end
+
+      # Checks if file exists (using checkfiles service) and gets data necessary for download.
+      #
+      # Returns true or false, which determines whether the file can be downloaded.
+      #
+      def check
+        res = super
+        if res
+          @remote_filename = @filename
+          @filename = @local_filename || @remote_filename
+        end
+        res
+      end
+
+      # Generates link which downloads file by Rapidshare API
+      #
+      def download_link
+        download_params = { :sub => 'download', :fileid => @fileid, :filename => @remote_filename, :cookie => @api.cookie }
+        DOWNLOAD_URL % [ @server_id, @short_host, download_params.to_query ]
+      end
+    end
+  end
+end

data/lib/rapidshare-ext/version.rb

@@ -1,5 +1,5 @@
 module Rapidshare
   module Ext
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/rapidshare-ext.rb

@@ -3,6 +3,7 @@ require "rapidshare"
 require "rapidshare-base/utils"
 require "rapidshare-base/api"
 require "rapidshare-ext/api"
+require "rapidshare-ext/download"
 require "rapidshare-ext/version"
 
 class Rapidshare::API

data/rapidshare-ext.gemspec

@@ -4,7 +4,6 @@ require File.expand_path('../lib/rapidshare-ext/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.name          = "rapidshare-ext"
   gem.version       = Rapidshare::Ext::VERSION
-  gem.date          = '2012-11-18'
   gem.authors       = ["odiszapc"]
   gem.email         = ["odiszapc@gmail.com"]
   gem.description   = %q{Extends the base rapidshare gem with a set of handy features}

data/test/integration/rapidshare-ext_test.rb

@@ -8,11 +8,20 @@ class RapidshareExtTest < Test::Unit::TestCase
     FakeWeb.allow_net_connect = true
     @rs = Rapidshare::API.new :cookie =>  ENV['RAPIDSHARE_COOKIE']
     @rs.erase_all_data!
+
+    @download_dir = File.expand_path(File.dirname(__FILE__) + "/../../tmp")
+    File.delete "#@download_dir/file1.txt" if File.exist? "#@download_dir/file1.txt"
+    File.delete "#@download_dir/file2.txt" if File.exist? "#@download_dir/file2.txt"
+    File.delete "#@download_dir/upload_file_1.txt" if File.exist? "#@download_dir/upload_file_1.txt"
+
+    @upload_file_1 = File.expand_path(File.dirname(__FILE__) + "/../fixtures/files/upload1.txt")
+    @upload_file_1_md5 = Digest::MD5.hexdigest(File.read(@upload_file_1))
+    @upload_file_1_size = File.size @upload_file_1
   end
 
   context "Api" do
     should "Upload file" do
-      assertion = ->(resp, size_local, digest_local, remote_filename) do
+      upload_assertion = ->(resp, size_local, digest_local, remote_filename) do
         assert_instance_of Hash, resp
         assert_kind_of Integer, resp[:id]
         assert_kind_of Integer, resp[:size]
@@ -24,24 +33,13 @@ class RapidshareExtTest < Test::Unit::TestCase
         assert_equal "https://rapidshare.com/files/#{resp[:id]}/#{URI::encode(remote_filename)}", resp[:url]
       end
 
-      file_info_assertion = ->(info, file_id, digest_local, size_local, remote_filename, remote_dir) do
-        assert_equal info[:filename], remote_filename
-        assert_equal info[:id].to_i, file_id
-        assert_equal info[:md5hex].downcase, digest_local
-        assert_equal info[:realfolder].to_i, @rs.folder_id(remote_dir)
-        assert_equal info[:size].to_i, size_local
-      end
-
-      local_path = File.expand_path(File.dirname(__FILE__) + "/../fixtures/files/upload1.txt")
       remote_filename = "upload_file_1.txt"
       remote_dir = "a/b/c"
       remote_path = "#{remote_dir}/#{remote_filename}"
-      digest_local = Digest::MD5.hexdigest(File.read(local_path))
-      size_local = File.size local_path
 
       # Initial upload
-      response = @rs.upload local_path, :as => remote_filename, :to => remote_dir
-      assertion.call response, size_local, digest_local, remote_filename
+      response = @rs.upload @upload_file_1, :as => remote_filename, :to => remote_dir
+      upload_assertion.call response, @upload_file_1_size, @upload_file_1_md5, remote_filename
       assert_false response[:already_exists?]
 
       # Check file ID
@@ -51,33 +49,83 @@ class RapidshareExtTest < Test::Unit::TestCase
 
       # Check file info
       info = @rs.file_info remote_path
-      file_info_assertion.call info, file_id, digest_local, size_local, remote_filename, remote_dir
+      assert_not_nil info
+      assert_equal info[:filename], remote_filename
+      assert_equal info[:id].to_i, file_id
+      assert_equal info[:size].to_i, @upload_file_1_size
+      assert_equal info[:md5hex].downcase, @upload_file_1_md5
+      assert_equal info[:realfolder].to_i, @rs.folder_id(remote_dir)
 
       # Upload the same file again
-      response = @rs.upload local_path, :as => remote_filename, :to => remote_dir
-      assertion.call response, size_local, digest_local, remote_filename
+      response = @rs.upload @upload_file_1, :to => remote_dir, :as => remote_filename
+      upload_assertion.call response, @upload_file_1_size, @upload_file_1_md5, remote_filename
       assert_true response[:already_exists?]
+    end
+
+    should "Download file" do
+      @rs.upload @upload_file_1, :to => "/a/b/c", :as => "upload_file_1.txt"
+      assert_not_nil @rs.file_info("/a/b/c/upload_file_1.txt")
+
+      @rs.download "/a/b/c/upload_file_1.txt", :downloads_dir => @download_dir, :save_as => "file1.txt"
+      assert_path_exist "#@download_dir/file1.txt"
+      assert_equal @upload_file_1_size, File.size("#@download_dir/file1.txt")
+      assert_equal @upload_file_1_md5, Digest::MD5.hexdigest(File.read("#@download_dir/file1.txt"))
+
+      # Download with default :save_as
+      @rs.download "/a/b/c/upload_file_1.txt", :downloads_dir => @download_dir
+      assert_path_exist "#@download_dir/upload_file_1.txt"
+      assert_equal @upload_file_1_size, File.size("#@download_dir/upload_file_1.txt")
+      assert_equal @upload_file_1_md5, Digest::MD5.hexdigest(File.read("#@download_dir/upload_file_1.txt"))
+
+      # Download by http url
+      download_url = @rs.file_info("/a/b/c/upload_file_1.txt")[:url]
+      @rs.download download_url, :downloads_dir => @download_dir, :save_as => "file2.txt"
+      assert_path_exist "#@download_dir/file2.txt"
+      assert_equal @upload_file_1_size, File.size("#@download_dir/file2.txt")
+      assert_equal @upload_file_1_md5, Digest::MD5.hexdigest(File.read("#@download_dir/file2.txt"))
+    end
+
+    should "Rename file" do
+      @rs.upload @upload_file_1, :to => "/a/b/c", :as => "upload_file_1.txt"
+      assert_not_nil @rs.file_info("/a/b/c/upload_file_1.txt")
+
+      @rs.rename_file "/a/b/c/upload_file_1.txt", "file_2.txt"
+      info = @rs.file_info "/a/b/c/file_2.txt"
 
-      # Rename file
-      remote_filename_2 ="foo.txt"
-      remote_path_2 = "#{remote_dir}/#{remote_filename_2}"
-      @rs.rename_file remote_path, remote_filename_2
-      info = @rs.file_info remote_path_2
-      file_info_assertion.call info, @rs.file_id(remote_path_2), digest_local, size_local, remote_filename_2, remote_dir
+      assert_not_nil info
+      assert_equal info[:filename], "file_2.txt"
+      assert_equal info[:realfolder].to_i, @rs.folder_id("/a/b/c")
+      assert_equal info[:size].to_i, @upload_file_1_size
+      assert_equal info[:md5hex].downcase, @upload_file_1_md5
+    end
+
+    should "Move file" do
+      @rs.upload @upload_file_1, :to => "/a/b/c", :as => "upload_file_1.txt"
+      assert_not_nil @rs.file_info("/a/b/c/upload_file_1.txt")
 
-      # Move file
-      remote_dir_3 = "a/b"
-      remote_path_3 = "#{remote_dir_3}/#{remote_filename_2}"
-      @rs.move_file remote_path_2, :to => remote_dir_3
+      @rs.move_file "/a/b/c/upload_file_1.txt", :to => "/a/b"
+      assert_nil @rs.file_info("/a/b/c/upload_file_1.txt")
 
-      info = @rs.file_info remote_path_3
-      file_info_assertion.call info, @rs.file_id(remote_path_3), digest_local, size_local, remote_filename_2, remote_dir_3
+      info = @rs.file_info "/a/b/upload_file_1.txt"
+      assert_not_nil info
+      assert_equal info[:filename], "upload_file_1.txt"
+      assert_equal info[:realfolder].to_i, @rs.folder_id("/a/b")
+      assert_equal info[:size].to_i, @upload_file_1_size
+      assert_equal info[:md5hex].downcase, @upload_file_1_md5
+    end
 
-      # Delete file
-      @rs.remove_file remote_path_3
+    should "Delete file" do
+      @rs.upload @upload_file_1, :to => "/a/b/c", :as => "upload_file_1.txt"
+      assert_not_nil @rs.file_info("/a/b/c/upload_file_1.txt")
 
-      info = @rs.file_info remote_path_3
-      assert_nil info
+      @rs.remove_file "/a/b/c/upload_file_1.txt"
+      assert_nil @rs.file_info("/a/b/c/upload_file_1.txt")
+    end
+
+    should "Folder id <=> path conversions" do
+      @rs.add_folder "/a/b/c"
+      id = @rs.folder_id("/a/b/c")
+      assert_equal "/a/b/c", @rs.folder_path(id)
     end
 
     should "Create folder" do
@@ -87,48 +135,29 @@ class RapidshareExtTest < Test::Unit::TestCase
       tree = @rs.folders_hierarchy
 
       assert_equal 3, tree.count
-      assert_equal "a/b/c", tree[folder_id][:path]
-      assert_equal "a/b", tree[tree[folder_id][:parent]][:path]
-      assert_equal "a", tree[tree[tree[folder_id][:parent]][:parent]][:path]
+      assert_equal "/a/b/c", tree[folder_id][:path]
+      assert_equal "/a/b", tree[tree[folder_id][:parent]][:path]
+      assert_equal "/a", tree[tree[tree[folder_id][:parent]][:parent]][:path]
     end
 
     should "Move folder" do
-      folder_id = @rs.add_folder "a/b/c"
+      folder_id = @rs.add_folder "/a/b/c"
       assert_kind_of Integer, folder_id
       assert_not_equal 0, folder_id
       tree = @rs.folders_hierarchy
 
       assert_equal 3, tree.count
-      assert_equal "a/b/c", tree[folder_id][:path]
-      assert_equal "a/b", tree[tree[folder_id][:parent]][:path]
-      assert_equal "a", tree[tree[tree[folder_id][:parent]][:parent]][:path]
+      assert_equal "/a/b/c", tree[folder_id][:path]
+      assert_equal "/a/b", tree[tree[folder_id][:parent]][:path]
+      assert_equal "/a", tree[tree[tree[folder_id][:parent]][:parent]][:path]
 
-      @rs.move_folder "a/b/c", :to => 'a'
+      @rs.move_folder "/a/b/c", :to => 'a'
 
       tree = @rs.reload!
 
       assert_equal 3, tree.count
-      assert_equal "a/c", tree[folder_id][:path]
-      assert_equal @rs.folder_id("a"), tree[folder_id][:parent]
-    end
-
-    should "Build folder tree" do
-      # Create folder
-      folder_id = @rs.add_folder "a/b/c"
-      assert_kind_of Integer, folder_id
-      assert_not_equal 0, folder_id
-      tree = @rs.folders_hierarchy
-
-      # Validate tree
-      assert_equal 3, tree.count
-      assert_equal "a/b/c", tree[folder_id][:path]
-      assert_equal "a/b", tree[tree[folder_id][:parent]][:path]
-      assert_equal "a", tree[tree[tree[folder_id][:parent]][:parent]][:path]
-
-      # Validate subtree
-      sub_tree = @rs.folders_hierarchy :from => 'a/b'
-      assert_equal 1, sub_tree.count
-      assert_equal "c", sub_tree[folder_id][:path]
+      assert_equal "/a/c", tree[folder_id][:path]
+      assert_equal @rs.folder_id("/a"), tree[folder_id][:parent]
     end
 
     should "Remove folder" do
@@ -138,25 +167,65 @@ class RapidshareExtTest < Test::Unit::TestCase
       tree = @rs.folders_hierarchy
       assert_equal 3, tree.count
 
-      @rs.remove_folder "a/b/c"
+      @rs.remove_folder "/a/b/c"
 
       tree = @rs.folders_hierarchy!
       assert_equal 2, tree.count
 
 
-      folder_id = @rs.add_folder "a/b/c"
+      folder_id = @rs.add_folder "/a/b/c"
       assert_kind_of Integer, folder_id
       assert_not_equal 0, folder_id
       tree = @rs.folders_hierarchy!
       assert_equal 3, tree.count
 
-      @rs.remove_folder "a"
+      @rs.remove_folder "/a"
       tree = @rs.folders_hierarchy!
       assert_equal 0, tree.count
     end
 
-    should "Erase account" do
-      folder_id = @rs.add_folder "a/b/c"
+
+    should "Build folders tree" do
+      # Create folders
+      folder_a_id = @rs.add_folder "/a"
+      assert_kind_of Integer, folder_a_id
+      assert_not_equal 0, folder_a_id
+
+      folder_b_id = @rs.add_folder "/a/b"
+      assert_kind_of Integer, folder_b_id
+      assert_not_equal 0, folder_b_id
+
+      folder_c_id = @rs.add_folder "/a/b/c"
+      assert_kind_of Integer, folder_c_id
+      assert_not_equal 0, folder_c_id
+
+
+      tree = @rs.folders_hierarchy
+      # Validate tree
+      assert_equal 3, tree.count
+
+      assert_equal "a", tree[folder_a_id][:name]
+      assert_equal "/a", tree[folder_a_id][:path]
+      assert_equal 0, tree[folder_a_id][:parent]
+
+      assert_equal "b", tree[folder_b_id][:name]
+      assert_equal "/a/b", tree[folder_b_id][:path]
+      assert_equal folder_a_id, tree[folder_b_id][:parent]
+
+      assert_equal "c", tree[folder_c_id][:name]
+      assert_equal "/a/b/c", tree[folder_c_id][:path]
+      assert_equal folder_b_id, tree[folder_c_id][:parent]
+
+      # Validate subtree
+      sub_tree = @rs.folders_hierarchy :from => '/a/b'
+      assert_equal 1, sub_tree.count
+      assert_equal "/c", sub_tree[folder_c_id][:path]
+      assert_equal "c", sub_tree[folder_c_id][:name]
+      assert_equal folder_b_id, sub_tree[folder_c_id][:parent]
+    end
+
+    should "Erase all account data" do
+      folder_id = @rs.add_folder "/a/b/c"
       assert_kind_of Integer, folder_id
 
       folder_ids = @rs.folders_hierarchy.keys

data/test/test_helper.rb

@@ -37,4 +37,8 @@ class Test::Unit::TestCase
     @rs = Rapidshare::API.new(:login => 'valid_login', :password => 'valid_password')
   end
 
+  def upload local_path, remote_filename, remote_dir
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rapidshare-ext
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-18 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rapidshare
@@ -124,6 +124,7 @@ files:
 - lib/rapidshare-base/utils.rb
 - lib/rapidshare-ext.rb
 - lib/rapidshare-ext/api.rb
+- lib/rapidshare-ext/download.rb
 - lib/rapidshare-ext/version.rb
 - rapidshare-ext.gemspec
 - test/fixtures/files/upload1.txt