rhodes-framework 1.1.1 → 1.2.0

data/lib/rational.rb

@@ -3,7 +3,7 @@ class Fixnum
   alias quof fdiv
   alias rdiv quo
 
-  alias power! **
+  alias power! ** unless defined?(0.power!)
   alias rpower **
 
 end
@@ -13,7 +13,7 @@ class Bignum
   alias quof fdiv
   alias rdiv quo
 
-  alias power! **
+  alias power! ** unless defined?(0.power!)
   alias rpower **
 
 end

data/lib/rho/rho.rb

@@ -3,10 +3,12 @@ require 'rho/render'
 require 'rho/rhoapplication'
 require 'rhom'
 require 'rhofsconnector'
+require 'rho/rhoerror'
 
 module Rho
   class RHO
     APPLICATIONS = {}
+    APPNAME = 'app'
     
     def initialize(app_manifest_filename=nil)
       puts "Calling RHO.initialize"
@@ -25,10 +27,25 @@ module Rho
       Rhom::RhomDbAdapter::close
     end
     
+    def raise_rhoerror(errCode)
+        raise Rho::RhoError.new(errCode)
+    end
+    
+    def get_app(appname)
+      if (APPLICATIONS[appname].nil?)
+        require RhoApplication::get_app_path(appname)+'application'
+        APPLICATIONS[appname] = Object.const_get('AppApplication').new
+      end
+      APPLICATIONS[appname]
+    end
+    
     # Return the directories where we need to load configuration files
     def process_model_dirs(app_manifest_filename=nil)
       File.open(app_manifest_filename).each do |line|
-        require File.join(File.dirname(app_manifest_filename), line.chop)
+        str = line.chomp
+        if str != nil and str.length > 0 
+            require File.join(File.dirname(app_manifest_filename), str )
+        end    
       end
     end
     
@@ -38,10 +55,19 @@ module Rho
         File.open(Rho::RhoFSConnector.get_rhoconfig_filename).each do |line|
           parts = line.chop.split('=')
           key = parts[0]
-          value = parts[1..parts.length-1].join('=') if parts and parts.length > 1
+          value = nil
+          if key and defined? RHO_ME
+            value = rho_get_app_property(key.strip)
+          end
+          
+          if !value
+            value = parts[1] if parts[1]
+          end
+            
           if key and value
-            tmp = value.strip!
-            Rho::RhoConfig.config[key.strip] = tmp.gsub(/'|"/,'') if tmp
+            val = value.strip.gsub(/\'|\"/,'')
+            val = val == 'nil' ? nil : val
+            Rho::RhoConfig.add_config(key.strip,val)
           end  
         end
       rescue Exception => e
@@ -63,9 +89,10 @@ module Rho
           
           src_id = source['source_id']
           url = source['url']
+          name = source['name']
           if !self.source_initialized?(src_id)
             Rhom::RhomDbAdapter::insert_into_table('sources',
-                                                  {"source_id"=>src_id,"source_url"=>url})
+                                                  {"source_id"=>src_id,"source_url"=>url,"name"=>name})
           end
         end
       end
@@ -74,15 +101,6 @@ module Rho
     def source_initialized?(source_id)
       Rhom::RhomDbAdapter::select_from_table('sources','*', 'source_id'=>source_id).size > 0 ? true : false
     end
-    
-    def get_app(appname)
-      if (APPLICATIONS[appname].nil?)
-        require RhoApplication::get_app_path(appname)+'application'
-        #APPLICATIONS[appname] = Object.const_get(appname+'Application').new
-        APPLICATIONS[appname] = Object.const_get('AppApplication').new
-      end
-      APPLICATIONS[appname]
-    end
 
     def serve(req)
       begin
@@ -107,6 +125,8 @@ module Rho
     end
     
     def serve_index(index_name)
+    	# TODO: Removed hardcoded appname
+    	get_app(APPNAME).set_menu
         begin
             puts 'inside RHO.serve_index: ' + index_name
             res = init_response
@@ -118,6 +138,8 @@ module Rho
     end
 
     def serve_index_hash(index_name)
+    	    	# TODO: Removed hardcoded appname
+    	get_app(APPNAME).set_menu
         begin
             puts 'inside RHO.serve_index: ' + index_name
             res = init_response
@@ -161,10 +183,10 @@ module Rho
     data << "Expires: 0" << CRLF
 
       data << CRLF
-	  if ( !res['request-body'].nil? )
-		data << res['request-body']
-	  end
-	  	
+      if ( !res['request-body'].nil? )
+        data << res['request-body']
+      end
+        
       data
     end
 
@@ -187,10 +209,10 @@ module Rho
       body << <<-_HTML_STRING_
         <html>
             <head>
-                <title>Server Error</title>
                 <meta name="viewport" content="width=320"/>
             </head>
             <body>
+                <h2>Server Error</h2>
                 <p>
       _HTML_STRING_
       body << 'Error: ' << exception.message << "<br/>" if exception
@@ -213,13 +235,21 @@ module Rho
   class RhoConfig
     
     @@sources = {}
-    @@config = {'start_path' => '/app', 
-                'options_path' => '/app/Settings'}
+    @@config = {'start_path' => '/app', 'options_path' => '/app/Settings'}
     
     class << self
       def method_missing(name, *args)
-        varname = name.to_s.sub(/=/,'')
-        @@config[varname]
+      	unless name == Fixnum
+		      varname = name.to_s.gsub(/\=/,"")
+          setting = (name.to_s =~ /=/)
+          if setting
+            @@config[varname] = args[0]
+            # save changes to file
+            RhoConf.set_property_by_name(varname,args[0]) 
+          else
+            @@config[varname]
+          end
+        end
       end
       
       def sources
@@ -230,13 +260,18 @@ module Rho
         @@config
       end
       
+      def add_config(key,value)
+        @@config[key] = value if key # allow nil value
+      end
+      
       def add_source(modelname, new_source=nil)
         if new_source
           unless @@sources[new_source]
             @@sources[modelname] = new_source
+            @@sources[modelname]['name'] ||= modelname
           end
         end
       end
     end
   end # RhoConfig
-end # Rho
+end # Rho

data/lib/rho/rhoapplication.rb

@@ -3,15 +3,25 @@ require 'rhofsconnector'
 
 module Rho
   class RhoApplication
+  	attr_accessor :default_menu
 	
     def initialize
-      if @rhom.nil?
+      unless @rhom
         @rhom = Rhom::Rhom.new
       end
+      unless @default_menu
+      	@default_menu = { "Home" => :home, "Refresh" => :refresh, 
+      		"Sync" => :sync, "Options" => :options, "Log" => :log, :separator => nil, "Close" => :close }
+  	  end
     end
+    
+    def set_menu(menu=nil)
+      disp_menu = menu ? menu : @default_menu
+      puts "RhoApplication: Using menu - #{disp_menu.inspect}"
+  	  WebView.set_menu_items(disp_menu)
+	end
 	
     class << self
-	
       def get_app_path(appname)
         Rho::RhoFSConnector::get_app_path(appname)
       end
@@ -23,13 +33,12 @@ module Rho
       def get_model_path(appname, modelname)
         Rho::RhoFSConnector::get_model_path(appname, modelname)
       end
-	
     end
 
     def serve(req,res)
       req[:modelpath] = self.class.get_model_path req['application'], req['model']
       require req[:modelpath]+'controller'
-      res['request-body'] = (Object.const_get(req['model']+'Controller').new).send :serve, @rhom, req, res
+      res['request-body'] = (Object.const_get(req['model']+'Controller').new).send :serve, self, @rhom, req, res
     end
 
   end # RhoApplication

data/lib/rho/rhocontroller.rb

@@ -4,6 +4,7 @@ require 'rho/rhoviewhelpers'
 
 module Rho
   class RhoController
+  	attr_accessor :menu
 
     def default_action
       return Hash['GET','show','PUT','update','POST','update',
@@ -11,11 +12,14 @@ module Rho
       return Hash['GET','index','POST','create'][@request['request-method']]
     end
 
-    def serve(object_mapping,req,res)
-      @request, @response = req, res;
+    def serve(application,object_mapping,req,res)
+      @request, @response = req, res
       @object_mapping = object_mapping
       @params = RhoSupport::query_params req
-      send req['action'].nil? ? default_action : req['action']
+      res = send req['action'].nil? ? default_action : req['action']
+      application.set_menu(@menu)
+  	  @menu = nil
+  	  res
     end
 
     # Returns true if the request's header contains "XMLHttpRequest".

data/lib/rho/rhoerror.rb

@@ -0,0 +1,33 @@
+module Rho
+  class RhoError < Exception
+    ERR_NONE = 0
+    ERR_NETWORK = 1
+    ERR_REMOTESERVER = 2
+    ERR_RUNTIME = 3
+    ERR_UNEXPECTEDSERVERRESPONSE = 4
+    ERR_DIFFDOMAINSINSYNCSRC = 5
+    
+    attr_reader :code
+    
+    def initialize(err_code)
+        @code = err_code
+    end
+    
+    def message
+        if code == ERR_NETWORK
+            return "Could not establish network connection"
+        elsif code == ERR_REMOTESERVER
+            return "Server returned an error"
+        elsif code ==  ERR_RUNTIME
+            return "Internal error"
+        elsif code ==  ERR_UNEXPECTEDSERVERRESPONSE
+            return "Unexpected server response"
+        elsif code ==  ERR_DIFFDOMAINSINSYNCSRC
+            return "All sync sources should be from one domain"
+        end
+        
+        return "Unknown error"
+    end
+    
+  end # RhoError
+end # Rho

data/lib/rho/rhoutils.rb

@@ -1,10 +1,12 @@
 module Rho
   class RhoUtils
     def self.load_offline_data(tables=[], dir_prefix=nil)
-      first_row=true
       columns = []
       tables.each do |filename|
         Rhom::RhomDbAdapter.delete_all_from_table(filename)
+        Rhom::RhomDbAdapter.start_transaction
+
+        first_row=true
         prefix = dir_prefix.nil? ? "" : dir_prefix
         File.open(File.join(Rho::RhoFSConnector.get_base_app_path,'app',prefix,'fixtures',filename+'.txt')).each do |line|
           if first_row
@@ -18,8 +20,9 @@ module Rho
           end
           Rhom::RhomDbAdapter.insert_into_table(filename,row)
         end
+        
+        Rhom::RhomDbAdapter.commit
         columns = []
-        first_row = true
       end
     end
   end

data/lib/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '1.1.1'
+    VERSION = '1.2.0'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '1.1.1'
+    DBVERSION = '1.2.0'
   end
   
 end

data/lib/rhom/rhom.rb

@@ -21,17 +21,15 @@
 
 require 'rhom/rhom_object_factory'
 require 'rhom/rhom_object'
-if defined? RHO_DBME
-	require 'rhom/rhom_db_adapterME'
-else
-	require 'rhom/rhom_db_adapter'
-end
+require 'rhom/rhom_db_adapter'
 
 module Rhom
-  TABLE_NAME = 'object_values'
+  UPDATE_TYPES = ["'create'","'query'","'ask'"]
+  
+  class RecordNotFound < StandardError
+  end
   
   class Rhom
-    include RhomObject
     attr_accessor :factory
   
     def initialize
@@ -40,18 +38,33 @@ module Rhom
     
     class << Rhom
       def client_id
-        c_id = ::Rhom::RhomDbAdapter::select_from_table('client_info','client_id')[0]
+        c_id = ::Rhom::RhomDbAdapter.select_from_table('client_info','client_id')[0]
         c_id.nil? ? nil : c_id['client_id']
       end
       
       def database_full_reset
-        ::Rhom::RhomDbAdapter::delete_all_from_table(TABLE_NAME)
-        ::Rhom::RhomDbAdapter::delete_all_from_table('client_info')
+        SyncEngine.stop_sync
+        
+        ::Rhom::RhomDbAdapter.execute_sql("UPDATE client_info SET reset=1")
+
+        if defined? RHO_ME
+            ::Rhom::RhomDbAdapter.execute_sql("UPDATE sources SET token=NULL")
+        else
+            ::Rhom::RhomDbAdapter.execute_sql("UPDATE sources SET token=0")
+        end
+        
+        if defined? RHO_DBME
+            ::Rhom::RhomDbAdapter.destroy_table('object_values')
+            #::Rhom::RhomDbAdapter.delete_all_from_table('object_values')
+        else
+            ::Rhom::RhomDbAdapter.delete_all_from_table('object_values')
+            ::Rhom::RhomDbAdapter.execute_sql("VACUUM")
+        end    
       end
       
       def database_full_reset_and_logout
         database_full_reset
-        SyncEngine::logout
+        SyncEngine.logout
       end
     end #class methods
   end # Rhom

data/lib/rhom/rhom_db_adapter.rb

@@ -17,20 +17,18 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-#$:.unshift(File.join(File.dirname(__FILE__), '../../'))
-# require 'sqlite3/database'
 require 'rhodes'
 
 module Rhom
   class RhomDbAdapter
     
     @@database = nil
+    @@inside_transaction = false
     
     class << self
       
       # maintains a single database connection
       def open(dbfile=nil)
-        #puts "DB name = " + dbfile.inspect
         unless @@database or dbfile.nil?
           @@database = SQLite3::Database.new(dbfile)
         end
@@ -38,7 +36,7 @@ module Rhom
     
       # closes the database if and only if it is open
       def close
-        if @@database #and not @@database.closed?
+        if @@database
           @@database.close
           @@database = nil
         else
@@ -47,32 +45,58 @@ module Rhom
         return true
       end   
     
+      def start_transaction
+          begin
+            @@inside_transaction = true
+            @@database.start_transaction
+          rescue Exception => e
+            puts "exception when start_transaction"
+          end
+      end
+
+      def commit
+          begin
+            @@inside_transaction = false
+            @@database.commit
+          rescue Exception => e
+            puts "exception when commit transaction"
+          end
+      end
+
+      def rollback
+          begin
+            @@inside_transaction = false
+            @@database.rollback
+          rescue Exception => e
+            puts "exception when rollback transaction"
+          end
+      end
+    
       # execute a sql statement
       # optionally, disable the factory processing 
       # which returns the result array directly
       def execute_sql(sql=nil)
         result = []
         if sql
-          #puts 'query is ' + sql
+          #puts "RhomDbAdapter: Executing query - #{sql}"
           # Make sure we lock the sync engine's mutex
           # before we perform a database transaction.
           # This prevents concurrency issues.
           begin
-            SyncEngine::lock_sync_mutex
-            # execute sql statement inside of transaction
-            # result is returned as an array of hashes
-            # @@database.transaction unless @@database.transaction_active?
-            # @@database.results_as_hash = true
+            SyncEngine.lock_sync_mutex unless @@inside_transaction
             result = @@database.execute sql
-            # @@database.commit
-            SyncEngine::unlock_sync_mutex
+            SyncEngine.unlock_sync_mutex unless @@inside_transaction
           rescue Exception => e
-            puts "exception when running query: #{e}"
+            #puts "exception when running query: #{e}"
             # make sure we unlock even if there's an error!
-            SyncEngine::unlock_sync_mutex
+            if @@inside_transaction
+              raise
+            else
+              SyncEngine.unlock_sync_mutex
+            end    
           end
         end
-        #puts "returned #{result.length.to_s} records..."
+        #puts "result is: #{result.inspect}"
         result
       end
     
@@ -87,7 +111,6 @@ module Rhom
         if select_arr and select_arr.length > 0
           where_str += " and attrib in (#{select_str(select_arr)})"
         end
-        #puts "where_str: #{where_str}" if where_str
         where_str
       end
       
@@ -109,19 +132,20 @@ module Rhom
       def string_from_key_vals(values, delim)
         vals = ""
         values.each do |key,value|
-          vals << " #{key} = #{get_value_for_sql_stmt(value)} #{delim}"
+          op = value.nil? ? 'is ' : '= '
+          vals << " \"#{key}\" #{op} #{get_value_for_sql_stmt(value)} #{delim}"
         end
         vals
       end
       
       # generates a value for sql statement
       def get_value_for_sql_stmt(value)
-        if value.is_a?(String)
-          "'#{value}'"
-        elsif value.nil?
+        if value.nil? or value == 'NULL'
           "NULL"
+        elsif value.is_a?(String)
+          "'#{value}'"
         else
-          "#{value}"
+          "'#{value.to_s}'"
         end
       end
     
@@ -193,7 +217,16 @@ module Rhom
         end
         execute_sql query
       end
-    
+
+      # deletes all rows from a given table by recreating db-file and save all other tables
+      def destroy_table(table)
+        query = nil
+        if table
+          query = "destroy #{table}"
+        end
+        execute_sql query
+      end
+      
       # updates values (hash) in a given table which satisfy condition (hash)
       # example usage is the following:
       # update_into_table('object_values',{"value"=>"Electronics"},{"object"=>"some-object", "attrib"=>"industry"})
@@ -212,5 +245,5 @@ module Rhom
 end # Rhom
 
 at_exit do
-	Rhom::RhomDbAdapter::close
+	::Rhom::RhomDbAdapter.close
 end