lib/rmega/session.rb in rmega-0.0.6 vs lib/rmega/session.rb in rmega-0.1.0

@@ -1,73 +1,62 @@
+require 'rmega/storage'
+require 'rmega/request_error'
+require 'rmega/crypto/crypto'
+require 'rmega/utils'
+
 module Rmega
+  def self.login(email, password)
+    Session.new(email, password).storage
+  end
+
   class Session
+    include Loggable
+
     attr_accessor :email, :request_id, :sid, :master_key
 
-    def initialize email, password_str
+    def initialize(email, password)
       self.email = email
       self.request_id = random_request_id
 
-      login password_str
+      login(password)
     end
 
-    def logger
-      Rmega.logger
-    end
-
-
-    # Delegate to Rmega.options
-
     def options
       Rmega.options
     end
 
-    def api_request_timeout
-      options.api_request_timeout
-    end
+    delegate :api_url, :api_request_timeout, to: :options
 
-    def api_url
-      options.api_url
-    end
-
-
-    # Cache the Storage class
-
     def storage
-      @storage ||= Storage.new self
+      @storage ||= Storage.new(self)
     end
 
-
-    # Login-related methods
-
-    def login password_str
-      uh = Crypto.stringhash Crypto.prepare_key_pw(password_str), email
+    def login(password)
+      uh = Crypto.stringhash Crypto.prepare_key_pw(password), email
       resp = request a: 'us', user: email, uh: uh
 
       # Decrypt the master key
-      encrypted_key = Crypto.prepare_key_pw password_str
+      encrypted_key = Crypto.prepare_key_pw password
       self.master_key = Crypto.decrypt_key encrypted_key, Utils.base64_to_a32(resp['k'])
 
       # Generate the session id
       self.sid = Crypto.decrypt_sid master_key, resp['csid'], resp['privk']
     end
 
-
-    # Api requests methods
-
     def random_request_id
       rand(1E7..1E9).to_i
     end
 
-    def request body
+    def request(body)
       self.request_id += 1
       url = "#{api_url}?id=#{request_id}"
       url << "&sid=#{sid}" if sid
       logger.info "POST #{url}"
       logger.info "#{body.inspect}"
       response = HTTPClient.new.post url, [body].to_json, timeout: api_request_timeout
       logger.debug "#{response.code}\n#{response.body}"
       resp = JSON.parse(response.body).first
-      raise ApiRequestError.new(resp) if ApiRequestError.is_error_code?(resp)
+      raise RequestError.new(resp) if RequestError.error_code?(resp)
       resp
     end
   end
 end