rmega 0.0.6 → 0.1.0

data/lib/rmega/utils.rb

@@ -1,35 +1,16 @@
+require 'rmega/utils'
+
 module Rmega
   module Utils
     extend self
 
-    def show_progress direction, total, increment = 0
-      return unless Rmega.options.show_progress
-      if increment.zero?
-        @progressbar = nil
-        @progressbar_progress = 0
-      end
-      @progressbar_progress += increment
-      format = "#{direction.to_s.capitalize} in progress #{Utils.format_bytes(@progressbar_progress)} of #{Utils.format_bytes(total)} | %P% | %e        "
-      @progressbar ||= ProgressBar.create format: format, total: total
-      @progressbar.reset if increment.zero?
-      @progressbar.format format
-      @progressbar.progress += increment
-    end
-
-    def format_bytes bytes, round = 2
-      units = ['bytes', 'kb', 'MB', 'GB', 'TB', 'PB']
-      e = (bytes == 0 ? 0 : Math.log(bytes)) / Math.log(1024)
-      value = bytes.to_f / (1024 ** e.floor)
-      "#{value.round(round)}#{units[e]}"
-    end
-
-    def str_to_a32 string
+    def str_to_a32(string)
       pad_to = string.bytesize + ((string.bytesize) % 4)
       string = string.ljust pad_to, "\x00"
       string.unpack 'l>*'
     end
 
-    def a32_to_str a32, len=nil
+    def a32_to_str(a32, len = nil)
       if len
         b = []
         len.times do |i|
@@ -46,15 +27,15 @@ module Rmega
       @b64a ||= ('A'..'Z').to_a + ('a'..'z').to_a + ('0'..'9').to_a + ["-", "_", "="]
     end
 
-    def a32_to_base64 a32
+    def a32_to_base64(a32)
       base64urlencode a32_to_str(a32)
     end
 
-    def base64_to_a32 base64
+    def base64_to_a32(base64)
       str_to_a32 base64urldecode(base64)
     end
 
-    def base64urlencode string
+    def base64urlencode(string)
       i = 0
       tmp_arr = []
 
@@ -81,7 +62,7 @@ module Rmega
       (r != 0) ? enc[0..r - 4] : enc
     end
 
-    def base64urldecode data
+    def base64urldecode(data)
       data += '=='[((2-data.length*3)&3)..-1]
 
       i = 0
@@ -121,7 +102,7 @@ module Rmega
       tmp_arr.join ''
     end
 
-    def mpi2b s
+    def mpi2b(s)
       bn = 1
       r = [0]
       rn = 0
@@ -159,7 +140,7 @@ module Rmega
       r
     end
 
-    def b2s b
+    def b2s(b)
       bs = 28
       bm = 268435455
       bn = 1; bc = 0; r = [0]; rb = 1; rn = 0
@@ -196,5 +177,30 @@ module Rmega
 
       rr
     end
+
+    def chunks(size)
+      list = {}
+      p = 0
+      pp = 0
+      i = 1
+
+      while i <= 8 and p < size - (i * 0x20000)
+        list[p] = i * 0x20000
+        pp = p
+        p += list[p]
+        i += 1
+      end
+
+      while p < size
+        list[p] = 0x100000
+        pp = p
+        p += list[p]
+      end
+
+      if size - pp > 0
+        list[pp] = size - pp
+      end
+      list
+    end
   end
 end

data/lib/rmega/version.rb

@@ -1,3 +1,3 @@
 module Rmega
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

data/lib/rmega.rb

@@ -1,58 +1,13 @@
-# Gem with ruby 1.9+
-require "openssl"
-require "json"
-require "logger"
-require "ostruct"
-
-# Gems in the bundle
+require 'active_support/json'
+require 'active_support/core_ext/object/to_json'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/string/inflections'
-require "httpclient"
-require "execjs"
-require "ruby-progressbar"
-
-# Require all the other files
-require "rmega/version"
-require "rmega/loggable"
-require "rmega/utils"
-require "rmega/crypto/rsa"
-require "rmega/crypto/aes"
-require "rmega/crypto/aes_ctr"
-require "rmega/crypto/crypto"
-require "rmega/storage"
-require "rmega/nodes/node"
-require "rmega/nodes/file_node"
-require "rmega/nodes/folder_node"
-require "rmega/session"
-require "rmega/api_request_error"
-require "rmega/pool"
-require "rmega/downloader"
+require 'httpclient'
+require 'ruby-progressbar'
+require 'execjs'
+require 'rmega/version'
+require 'rmega/options'
+require 'rmega/session'
 
 module Rmega
-  def self.logger
-    @logger ||= begin
-      logger = Logger.new $stdout
-      logger.formatter = Proc.new { | severity, time, progname, msg| "#{msg}\n" }
-      logger.level = Logger::ERROR
-      logger
-    end
-  end
-
-  def self.login email, password
-    session = Session.new email, password
-    session.storage
-  end
-
-  def self.default_options
-    {
-      show_progress:        true,
-      upload_timeout:       120,
-      api_request_timeout:  20,
-      api_url:              'https://eu.api.mega.co.nz/cs'
-    }
-  end
-
-  def self.options
-    @options ||= OpenStruct.new default_options
-  end
 end

data/rmega.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["dani.m.mobile@gmail.com"]
   gem.description   = %q{mega.co.nz ruby api}
   gem.summary       = %q{mega.co.nz ruby api}
-  gem.homepage      = "https://github.com/daniele-m/rmega"
+  gem.homepage      = "https://github.com/topac/rmega"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -18,8 +18,8 @@ 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/{file_operations_spec.rb → file_download_spec.rb}

@@ -1,17 +1,13 @@
 require 'integration_spec_helper'
 require 'fileutils'
 
-describe 'File operations' do
+describe 'File download' do
 
   if account_file_exists?
 
-    let(:temp_folder) { "/tmp/.rmega_spec" }
+    let(:storage) { login }
 
-    before { FileUtils.mkdir_p(temp_folder) }
-
-    after { FileUtils.rm_rf(temp_folder) }
-
-    context 'give a public mega url, related to a small file' do
+    context 'given a public mega url (a small file)' do
 
       # A file called testfile.txt containting the string "helloworld!"
       let(:url) { 'https://mega.co.nz/#!MAkg2Iab!bc9Y2U6d93IlRRKVYpcC9hLZjS4G278OPdH6nTFPDNQ' }
@@ -23,7 +19,7 @@ describe 'File operations' do
       end
     end
 
-    context 'give a public mega url, related to a big file' do
+    context 'given a public mega url (a big file)' do
 
       # A file called testfile_big_15mb.txt containting the word "topac" repeated 3145728 times (~ 15mb)
       let(:url) { 'https://mega.co.nz/#!NYVkDaLD!BKyN5SRpOaEtGnTcwiAqcxmJc7p-k0IPWKAW-471KRE' }

data/spec/integration/folder_operations_spec.rb

@@ -1,30 +1,42 @@
 require 'integration_spec_helper'
 
 describe 'Folders operations' do
+
   if account_file_exists?
-    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
+
+    before(:all) do
+      @name = "test_folder_#{rand.denominator}_#{rand.denominator}"
+      @storage = login
     end
 
-    it 'creates a new folder' do
-      @folder_node.should be_kind_of Rmega::Node
+    def find_folder
+      @storage.root.folders.find { |f| f.name == @name }
     end
 
-    it 'finds the folder' do
-      node = @session.storage.nodes.find { |n| n.name == @folder_name }
-      node.should_not be_nil
+    context 'when #create_folder is called on a node' do
+
+      it 'creates a new folder under that node' do
+        folder = @storage.root.create_folder(@name)
+        expect(folder.name).to eql @name
+      end
     end
 
-    it 'deletes the folder' do
-      lambda { @folder_node.delete }.should_not raise_error
+    context 'searching for a folder by its name' do
+
+      it 'returns the matching folder' do
+        expect(find_folder.name).to eql @name
+      end
     end
 
-    it 'does not find the folder anymore' do
-      node = @session.storage.nodes.find { |n| n.name == @folder_name }
-      node.should be_nil
+    context 'when #delete is called on a folder node' do
+
+      it 'deletes the folder' do
+        expect(find_folder.delete).to eql 0
+      end
+
+      it 'does not find the folder anymore' do
+        expect(find_folder).to be_nil
+      end
     end
   end
 end

data/spec/integration/login_spec.rb

@@ -1,17 +1,18 @@
 require 'integration_spec_helper'
 
-describe 'Login process' do
+describe 'Login' do
+
   if account_file_exists?
+
     context 'when email and password are correct' do
-      it 'returns a valid object' do
-        object = storage
-        object.should respond_to :nodes
+      it 'returns a Storage object' do
+        expect(login).to respond_to :nodes
       end
     end
 
     context 'when email and password are invalid' do
       it 'raises an error' do
-        lambda { Rmega.login 'a@apple.com', 'b' }.should raise_error(Rmega::ApiRequestError)
+        expect { Rmega.login('a@apple.com', 'b') }.to raise_error(Rmega::RequestError)
       end
     end
   end

data/spec/integration_spec_helper.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
-require "yaml"
-
+require 'yaml'
 
 def account_file_path
   File.join File.dirname(__FILE__), 'integration/rmega_account.yml'
@@ -14,6 +13,15 @@ def account
   @account ||= YAML.load_file account_file_path
 end
 
-def storage
-  Rmega.login account['email'], account['password']
+def login
+  Rmega.login(account['email'], account['password'])
+end
+
+def temp_folder
+  '/tmp/.rmega_spec'
+end
+
+RSpec.configure do |config|
+  config.before { FileUtils.mkdir_p(temp_folder) }
+  config.after { FileUtils.rm_rf(temp_folder) }
 end

data/spec/rmega/lib/utils_spec.rb

@@ -22,13 +22,6 @@ describe Rmega::Utils do
     end
   end
 
-  describe '#format_bytes' do
-    it 'converts to the correct unit' do
-      described_class.format_bytes(1024, 2).should == '1.0kb'
-      described_class.format_bytes(1024**2).should == '1.0MB'
-    end
-  end
-
   describe '#a32_to_str' do
     it 'returns the expected value' do
       a32 = [1953853537, 1660944384]

data/spec/spec_helper.rb

@@ -1,12 +1,5 @@
-require 'pry'
-
-def libpath
-  File.expand_path File.join(File.dirname(__FILE__), '../lib')
-end
+RMEGA_LIB_PATH = File.expand_path File.join(File.dirname(__FILE__), '../lib')
+$: << RMEGA_LIB_PATH
 
-def require_all
-  $: << libpath
-  require 'rmega'
-end
-
-require_all
+require 'pry'
+require 'rmega'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmega
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -91,22 +91,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-progressbar
-  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: execjs
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +120,6 @@ files:
 - README.md
 - Rakefile
 - lib/rmega.rb
-- lib/rmega/api_request_error.rb
 - lib/rmega/crypto/aes.rb
 - lib/rmega/crypto/aes_ctr.rb
 - lib/rmega/crypto/crypto.rb
@@ -144,16 +127,27 @@ files:
 - lib/rmega/crypto/rsa_mega.js
 - lib/rmega/downloader.rb
 - lib/rmega/loggable.rb
-- lib/rmega/nodes/file_node.rb
-- lib/rmega/nodes/folder_node.rb
+- lib/rmega/nodes/deletable.rb
+- lib/rmega/nodes/expandable.rb
+- lib/rmega/nodes/factory.rb
+- lib/rmega/nodes/file.rb
+- lib/rmega/nodes/folder.rb
+- lib/rmega/nodes/inbox.rb
 - lib/rmega/nodes/node.rb
+- lib/rmega/nodes/root.rb
+- lib/rmega/nodes/trash.rb
+- lib/rmega/nodes/traversable.rb
+- lib/rmega/options.rb
 - lib/rmega/pool.rb
+- lib/rmega/progress.rb
+- lib/rmega/request_error.rb
 - lib/rmega/session.rb
 - lib/rmega/storage.rb
+- lib/rmega/uploader.rb
 - lib/rmega/utils.rb
 - lib/rmega/version.rb
 - rmega.gemspec
-- spec/integration/file_operations_spec.rb
+- spec/integration/file_download_spec.rb
 - spec/integration/folder_operations_spec.rb
 - spec/integration/login_spec.rb
 - spec/integration_spec_helper.rb
@@ -161,7 +155,7 @@ files:
 - spec/rmega/lib/crypto/crypto_spec.rb
 - spec/rmega/lib/utils_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/daniele-m/rmega
+homepage: https://github.com/topac/rmega
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -186,7 +180,7 @@ signing_key:
 specification_version: 3
 summary: mega.co.nz ruby api
 test_files:
-- spec/integration/file_operations_spec.rb
+- spec/integration/file_download_spec.rb
 - spec/integration/folder_operations_spec.rb
 - spec/integration/login_spec.rb
 - spec/integration_spec_helper.rb

data/lib/rmega/nodes/file_node.rb

@@ -1,27 +0,0 @@
-require_relative '../downloader'
-
-module Rmega
-  class FileNode < Node
-    def storage_url
-      @storage_url ||= data['g'] || request(a: 'g', g: 1, n: handle)['g']
-    end
-
-    def download(path)
-      path = File.expand_path(path)
-      path = Dir.exists?(path) ? File.join(path, name) : path
-
-      logger.info "Download #{name} (#{filesize} bytes) => #{path}"
-
-      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]
-
-      donwloader = Downloader.new(base_url: storage_url, filesize: filesize, local_path: path)
-
-      donwloader.download do |start, buffer|
-        nonce = [nonce[0], nonce[1], (start/0x1000000000) >> 0, (start/0x10) >> 0]
-        Crypto::AesCtr.decrypt(k, nonce, buffer)[:data]
-      end
-    end
-  end
-end

data/lib/rmega/nodes/folder_node.rb

@@ -1,29 +0,0 @@
-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