rmega 0.0.3 → 0.0.4

data/README.md

@@ -1,4 +1,5 @@
-# Rmega
+# Rmega [![Build Status](https://travis-ci.org/daniele-m/rmega.png)](https://travis-ci.org/daniele-m/rmega)
+
 
 Ruby library for the Mega.co.nz API.  
 Tested using ruby 1.9.3+ (OpenSSL 0.9.8r+)
@@ -11,29 +12,53 @@ Tested using ruby 1.9.3+ (OpenSSL 0.9.8r+)
 
 ## Usage
 
+    $ gem install rmega
+    $ irb -r rmega
+
+### Login and retrive all the files and folders
+
 ```ruby
 storage = Rmega.login 'your_email', 'your_password'
 
 # Fetch all the nodes (files, folders, ecc.)
 nodes = storage.nodes
+```
 
-# Find all nodes which name match a regexp
-nodes = storage.nodes_by_name /my.document/i
 
-# Download a file
-my_node.download '~/Download' # The name of the node is used
-my_node.download '~/Download/mydocument_42.zip' # Specify a new name
+### Download a file or a folder
 
-# Download a file using a given url
-storage.download 'https://mega.co.nz/#!cER0GYbD!ZCHruEzLghAcEZuD44Dp0k--6m5duA08Xl4a_bUZYMI', '~/Download'
+```ruby
+file = storage.nodes_by_name(/document1/i).first
+file.name # => "MyDocument1.pdf"
+file.download '~/Downloads'
 
-# Upload a file (to the root node)
+folder = storage.nodes_by_name(/photos/i).first
+folder.download '~/Downloads/MyAlbums'
+```
+
+
+### Download a file using a public url
+
+```ruby
+storage.download 'https://mega.co.nz/#!cER0GYbD!ZCHruEA08Xl4a_bUZYMI', '~/Downloads'
+```
+
+
+### Upload a file
+
+```ruby
+# Upload a file (to the root folder)
 storage.upload '~/Downloads/my_file.zip'
 
 # Upload a file to a specific folder
-storage.upload '~/Downloads/my_file.zip', folder_node
+document_folder = storage.nodes_by_name(/photos/i).first
+storage.upload '~/Downloads/my_file.zip', document_folder
+```
+
+### Other operations
 
-# Trash a node
+```ruby
+# Trash a file or a folder
 my_node.trash
 
 # Gets the public url (the sharable one) of a file
@@ -41,12 +66,6 @@ my_node.public_url
 
 # See the attributes of a node
 my_node.attributes
-
-# Find all nodes of certain type
-# types are: file, dir, root, inbox, trash
-files   = storage.nodes_by_type :file
-folders = storage.nodes_by_type :dir
-
 ```
 
 

data/Rakefile

@@ -1,2 +1,6 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+task :default => :spec
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new

data/lib/rmega.rb

@@ -5,6 +5,8 @@ require "logger"
 require "ostruct"
 
 # Gems in the bundle
+require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/string/inflections'
 require "httpclient"
 require "execjs"
 require "ruby-progressbar"
@@ -17,7 +19,9 @@ require "rmega/crypto/aes"
 require "rmega/crypto/aes_ctr"
 require "rmega/crypto/crypto"
 require "rmega/storage"
-require "rmega/node"
+require "rmega/nodes/node"
+require "rmega/nodes/file_node"
+require "rmega/nodes/folder_node"
 require "rmega/session"
 require "rmega/api_request_error"
 
@@ -26,7 +30,7 @@ module Rmega
     @logger ||= begin
       logger = Logger.new $stdout
       logger.formatter = Proc.new { | severity, time, progname, msg| "#{msg}\n" }
-      logger.level = Logger::INFO
+      logger.level = Logger::ERROR
       logger
     end
   end

data/lib/rmega/api_request_error.rb

@@ -9,7 +9,7 @@ module Rmega
     end
 
     def self.is_error_code? number
-      !!Integer(number) rescue false
+      (Integer(number) && number.to_i < 0) rescue false
     end
 
     def self.all_messages

data/lib/rmega/crypto/crypto.rb

@@ -2,6 +2,10 @@ module Rmega
   module Crypto
     extend self
 
+    def random_key
+      Array.new(6).map { rand(0..0xFFFFFFFF) }
+    end
+
     def prepare_key ary
       pkey = [0x93C467E3,0x7DB0C7A4,0xD1BE3F81,0x0152CB56]
       65536.times do

data/lib/rmega/nodes/file_node.rb

@@ -0,0 +1,41 @@
+module Rmega
+  class FileNode < Node
+    def storage_url
+      @storage_url ||= data['g'] || request(a: 'g', g: 1, n: handle)['g']
+    end
+
+    def chunks
+      Storage.chunks filesize
+    end
+
+    def download path
+      path = File.expand_path path
+      path = Dir.exists?(path) ? File.join(path, name) : path
+
+      logger.info "Starting download into #{path}"
+
+      Utils.show_progress :download, filesize
+
+      k = decrypted_file_key
+      k = [k[0] ^ k[4], k[1] ^ k[5], k[2] ^ k[6], k[3] ^ k[7]]
+      nonce = decrypted_file_key[4..5]
+
+      file = File.open path, 'wb'
+      connection = HTTPClient.new.get_async storage_url
+      message = connection.pop
+
+      chunks.each do |chunk_start, chunk_size|
+        buffer = message.content.read chunk_size
+        # TODO: should be (chunk_start/0x1000000000) >>> 0, (chunk_start/0x10) >>> 0
+        nonce = [nonce[0], nonce[1], (chunk_start/0x1000000000) >> 0, (chunk_start/0x10) >> 0]
+        decryption_result = Crypto::AesCtr.decrypt(k, nonce, buffer)
+        file.write(decryption_result[:data])
+        Utils.show_progress :download, filesize, chunk_size
+      end
+
+      nil
+    ensure
+      file.close if file
+    end
+  end
+end

data/lib/rmega/nodes/folder_node.rb

@@ -0,0 +1,29 @@
+module Rmega
+  class FolderNode < Node
+    def self.create session, parent_node, folder_name
+      key = Crypto.random_key
+      encrypted_attributes = Utils.a32_to_base64 Crypto.encrypt_attributes(key[0..3], {n: folder_name.strip})
+      encrypted_key = Utils.a32_to_base64 Crypto.encrypt_key(session.master_key, key)
+      n = [{h: 'xxxxxxxx', t: 1, a: encrypted_attributes, k: encrypted_key}]
+      data = session.request a: 'p', t: parent_node.handle, n: n
+      new session, data['f'][0]
+    end
+
+    def children
+      storage.nodes.select { |node| node.parent_handle == handle }
+    end
+
+    def download path
+      children.each do |node|
+        if node.type == :file
+          node.download path
+        elsif node.type == :folder
+          subfolder = File.expand_path File.join(path, node.name)
+          Dir.mkdir(subfolder) unless Dir.exists?(subfolder)
+          node.download subfolder
+        end
+      end
+      nil
+    end
+  end
+end

data/lib/rmega/{node.rb → nodes/node.rb}

@@ -7,6 +7,13 @@ module Rmega
       @data = data
     end
 
+    def self.fabricate session, data
+      type_name = type_by_number(data['t']).to_s
+      node_class = Rmega.const_get("#{type_name}_node".camelize) rescue nil
+      node_class ||= Rmega::Node
+      node_class.new session, data
+    end
+
     def self.initialize_by_public_url session, public_url
       public_handle, key = public_url.split('!')[1, 2]
 
@@ -16,9 +23,17 @@ module Rmega
     end
 
     def self.types
-      {file: 0, dir: 1, root: 2, inbox: 3, trash: 4}
+      {file: 0, folder: 1, root: 2, inbox: 3, trash: 4}
+    end
+
+    def self.type_by_number number
+      founded_type = types.find { |k, v| number == v }
+      founded_type.first if founded_type
     end
 
+    def logger
+      Rmega.logger
+    end
 
     # Member actions
 
@@ -30,25 +45,34 @@ module Rmega
     end
 
     def trash
-      trash_node_public_handle = session.storage.trash_node.public_handle
-      session.request a: 'm', n: handle, t: trash_node_public_handle
+      trash_node_public_handle = storage.trash_node.public_handle
+      request a: 'm', n: handle, t: trash_node_public_handle
     end
 
 
+    # Delegate to session
+
+    delegate :storage, :request, :to => :session
+
+
     # Other methods
 
     def self.public_data session, public_handle
-      session.request a: 'g', g: 1, p: public_handle
+      request a: 'g', g: 1, p: public_handle
     end
 
     def public_handle
-      @public_handle ||= session.request(a: 'l', n: handle)
+      @public_handle ||= request(a: 'l', n: handle)
     end
 
     def handle
       data['h']
     end
 
+    def parent_handle
+      data['p']
+    end
+
     def filesize
       data['s']
     end
@@ -85,48 +109,11 @@ module Rmega
     end
 
     def type
-      founded_type = self.class.types.find { |k, v| data['t'] == v }
-      founded_type.first if founded_type
+      self.class.type_by_number data['t']
     end
 
     def delete
-      session.request a: 'd', n: handle
-    end
-
-    def storage_url
-      @storage_url ||= data['g'] || session.request(a: 'g', g: 1, n: handle)['g']
-    end
-
-    def chunks
-      Storage.chunks filesize
-    end
-
-    def download path
-      path = File.expand_path path
-      path = Dir.exists?(path) ? File.join(path, name) : path
-
-      Utils.show_progress :download, filesize
-
-      k = decrypted_file_key
-      k = [k[0] ^ k[4], k[1] ^ k[5], k[2] ^ k[6], k[3] ^ k[7]]
-      nonce = decrypted_file_key[4..5]
-
-      file = File.open path, 'wb'
-      connection = HTTPClient.new.get_async storage_url
-      message = connection.pop
-
-      chunks.each do |chunk_start, chunk_size|
-        buffer = message.content.read chunk_size
-        # TODO: should be (chunk_start/0x1000000000) >>> 0, (chunk_start/0x10) >>> 0
-        nonce = [nonce[0], nonce[1], (chunk_start/0x1000000000) >> 0, (chunk_start/0x10) >> 0]
-        decryption_result = Crypto::AesCtr.decrypt(k, nonce, buffer)
-        file.write(decryption_result[:data])
-        Utils.show_progress :download, filesize, chunk_size
-      end
-
-      nil
-    ensure
-      file.close if file
+      request a: 'd', n: handle
     end
   end
 end

data/lib/rmega/session.rb

@@ -9,8 +9,8 @@ module Rmega
       login password_str
     end
 
-    def debug message
-      Rmega.logger.debug message
+    def logger
+      Rmega.logger
     end
 
 
@@ -61,10 +61,10 @@ module Rmega
       self.request_id += 1
       url = "#{api_url}?id=#{request_id}"
       url << "&sid=#{sid}" if sid
-      debug "POST #{url}"
-      debug "#{body.inspect}"
+      logger.info "POST #{url}"
+      logger.info "#{body.inspect}"
       response = HTTPClient.new.post url, [body].to_json, timeout: api_request_timeout
-      debug "#{response.code}\n#{response.body}"
+      logger.debug "#{response.code}\n#{response.body}"
       resp = JSON.parse(response.body).first
       raise ApiRequestError.new(resp) if ApiRequestError.is_error_code?(resp)
       resp

data/lib/rmega/storage.rb

@@ -27,11 +27,11 @@ module Rmega
     end
 
 
-    # Nodes finders
+    # Nodes management
 
     def nodes
       nodes = session.request a: 'f', c: 1
-      nodes['f'].map { |node_data| Node.new(session, node_data) }
+      nodes['f'].map { |node_data| Node.fabricate(session, node_data) }
     end
 
     def nodes_by_type type
@@ -52,6 +52,10 @@ module Rmega
       @root_node ||= nodes_by_type(:root).first
     end
 
+    def create_folder parent_node, folder_name
+      FolderNode.create session, parent_node, folder_name
+    end
+
 
     # Handle node download
 
@@ -101,7 +105,7 @@ module Rmega
       filesize = File.size local_path
       upld_url = upload_url filesize
 
-      ul_key = Array.new(6).map { rand(0..0xFFFFFFFF) }
+      ul_key = Crypto.random_key
       aes_key = ul_key[0..3]
       nonce = ul_key[4..5]
       local_file = File.open local_path, 'rb'

data/lib/rmega/version.rb

@@ -1,3 +1,3 @@
 module Rmega
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/rmega.gemspec

@@ -17,7 +17,9 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "pry"
   gem.add_development_dependency "rspec"
+  gem.add_development_dependency "rake"
   gem.add_dependency "httpclient"
+  gem.add_dependency 'active_support'
   gem.add_dependency "ruby-progressbar"
   gem.add_dependency "execjs"
 end

data/spec/integration/folder_operations_spec.rb

@@ -0,0 +1,28 @@
+require 'integration_spec_helper'
+
+describe 'Folders operations' do
+  before :all do
+    @session = storage.session
+    @parent_node = @session.storage.root_node
+    @folder_name = "test_folder_#{rand.denominator}_#{rand.denominator}"
+    @folder_node = @session.storage.create_folder @parent_node, @folder_name
+  end
+
+  it 'creates a new folder' do
+    @folder_node.should be_kind_of Rmega::Node
+  end
+
+  it 'finds the folder' do
+    node = @session.storage.nodes.find { |n| n.name == @folder_name }
+    node.should_not be_nil
+  end
+
+  it 'deletes the folder' do
+    lambda { @folder_node.delete }.should_not raise_error
+  end
+
+  it 'does not find the folder anymore' do
+    node = @session.storage.nodes.find { |n| n.name == @folder_name }
+    node.should be_nil
+  end
+end

data/spec/integration/login_spec.rb

@@ -1,11 +1,10 @@
-# encoding: utf-8
 require 'integration_spec_helper'
 
 describe 'Login process' do
   if account_file_exists?
     context 'when email and password are correct' do
       it 'returns a valid object' do
-        object = Rmega.login valid_account['email'], valid_account['password']
+        object = storage
         object.should respond_to :nodes
       end
     end

data/spec/integration_spec_helper.rb

@@ -10,6 +10,10 @@ def account_file_exists?
   File.exists? account_file_path
 end
 
-def valid_account
-  @valid_account ||= YAML.load_file account_file_path
+def account
+  @account ||= YAML.load_file account_file_path
+end
+
+def storage
+  Rmega.login account['email'], account['password']
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmega
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-03 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: active_support
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -110,12 +142,15 @@ files:
 - lib/rmega/crypto/crypto.rb
 - lib/rmega/crypto/rsa.rb
 - lib/rmega/crypto/rsa_mega.js
-- lib/rmega/node.rb
+- lib/rmega/nodes/file_node.rb
+- lib/rmega/nodes/folder_node.rb
+- lib/rmega/nodes/node.rb
 - lib/rmega/session.rb
 - lib/rmega/storage.rb
 - lib/rmega/utils.rb
 - lib/rmega/version.rb
 - rmega.gemspec
+- spec/integration/folder_operations_spec.rb
 - spec/integration/login_spec.rb
 - spec/integration/rmega_account.yml.example
 - spec/integration_spec_helper.rb
@@ -148,6 +183,7 @@ signing_key:
 specification_version: 3
 summary: mega.co.nz ruby api
 test_files:
+- spec/integration/folder_operations_spec.rb
 - spec/integration/login_spec.rb
 - spec/integration/rmega_account.yml.example
 - spec/integration_spec_helper.rb