rhodes 2.0.3 → 2.1.0

data/lib/framework/rho/rho.rb

@@ -29,7 +29,7 @@ module Rho
     
     def initialize(app_manifest_filename=nil)
       puts "Calling RHO.initialize"
-      RHO.process_rhoconfig
+      #RHO.process_rhoconfig
       
       if app_manifest_filename
         process_model_dirs(app_manifest_filename)
@@ -74,6 +74,10 @@ module Rho
       get_app(APPNAME).on_activate_app
     end
 
+    def deactivate_app
+      get_app(APPNAME).on_deactivate_app
+    end
+
     # make sure we close the database file
     #def self.finalize
       #Rhom::RhomDbAdapter::close
@@ -94,6 +98,11 @@ module Rho
       if (APPLICATIONS[appname].nil?)
         require 'application' #RhoApplication::get_app_path(appname)+'application'
         APPLICATIONS[appname] = Object.const_get('AppApplication').new
+        unless APPLICATIONS[appname].initialized?
+          msg = "RhoApplication was not correctly initialized (forget to call 'super' in AppApplication.initialize ?)"
+          puts msg
+          raise msg
+        end
       end
       APPLICATIONS[appname]
     end
@@ -127,12 +136,13 @@ module Rho
     end
     
     # Return the directories where we need to load configuration files
+=begin
     def self.process_rhoconfig
       begin
         File.open(Rho::RhoFSConnector.get_rhoconfig_filename).each do |line|
           # Skip empty or commented out lines
           next if line =~ /^\s*(#|$)/
-          parts = line.chomp.split('=')
+          parts = line.chomp.split('=', 2)
           key = parts[0]
           value = nil
           if key and defined? RHO_ME
@@ -154,7 +164,8 @@ module Rho
         puts "Error opening rhoconfig.txt: #{e}, using defaults."
       end
     end
-
+=end
+    
     def check_source_migration(app)
 	  uniq_sources = Rho::RhoConfig::sources.values
       uniq_sources.each do |source|
@@ -560,7 +571,10 @@ module Rho
     end
         
     def send_error(exception=nil,status=500,hash=false)
-	  puts "App error: #{exception}" if exception
+      if exception
+        trace_msg = exception.backtrace.join("\n")
+	    puts "App error: #{exception}\n #{trace_msg}"
+	  end  
       body=''
       
       err_page = nil
@@ -613,20 +627,16 @@ module Rho
   class RhoConfig
     
     @@sources = {}
-    @@config = {'start_path' => '/app', 'options_path' => '/app/Settings'}
+    #@@config = {'start_path' => '/app', 'options_path' => '/app/Settings'}
     @@max_config_srcid = 1
     
     class << self
       def method_missing(name, *args)
-      	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]) 
+        unless name == Fixnum
+          if name[name.length()-1] == '='
+            RhoConf.set_property_by_name(name.to_s.chop,args[0]) 
           else
-            @@config[varname]
+            RhoConf.get_property_by_name(name.to_s)             
           end
         end
       end
@@ -635,10 +645,10 @@ module Rho
         RhoConf.is_property_exists(name)  
       end
       
-      def reload
-        @@config = {'start_path' => '/app', 'options_path' => '/app/Settings'}
-        Rho::RHO.process_rhoconfig
-      end
+      #def reload
+      #  @@config = {'start_path' => '/app', 'options_path' => '/app/Settings'}
+      #  Rho::RHO.process_rhoconfig
+      #end
       
       def max_config_srcid
         @@max_config_srcid
@@ -660,13 +670,13 @@ module Rho
         @@sources
       end
       
-      def config
-        @@config
-      end
+      #def config
+      #  @@config
+      #end
       
-      def add_config(key,value)
-        @@config[key] = value if key # allow nil value
-      end
+      #def add_config(key,value)
+      #  @@config[key] = value if key # allow nil value
+      #end
 
       def add_source(modelname, new_source=nil)
         return if !modelname || modelname.length() == 0# || @@sources[modelname]
@@ -709,74 +719,102 @@ module Rho
   end # RhoConfig
   
     module AsyncHttp
-        def self.ssl_verify_peer(args)
-            ret = args[:ssl_verify_peer]
-            ret = true if !ret.is_a? TrueClass and !ret.is_a? FalseClass
-            ret ? 1 : 0
-        end
 
         def self.make_auth_header(args)
-          auth = args[:authorization]
+          auth = args[:authentication]
           return nil unless auth.is_a? Hash
           return nil if auth[:type].nil?
 
           raise "Authorization type #{auth[:type].inspect.to_s} is unsupported" if auth[:type].to_s != 'basic'
-          raise "Username or password should be specified for 'basic' authorization" if auth[:username].nil? or auth[:password].nil?
+          raise "Username or password should be specified for 'basic' authentication" if auth[:username].nil? or auth[:password].nil?
 
           plain = 'Basic ' + [auth[:username].to_s + ':' + auth[:password].to_s].pack('m')
           # Remove trailing \n
           plain[0..-2]
         end
 
-        def self.headers(args)
+        @@user_agent = nil
+        def self.preprocess_headers(args)
           hdrs = args[:headers]
           hdrs = {} if hdrs.nil?
 
           if hdrs['User-Agent'].nil?
-            platform = System.get_property('platform')
-            device = System.get_property('device_name')
-            version = System.get_property('os_version')
-            hdrs['User-Agent'] = "Mozilla-5.0 (#{platform}; #{device}; #{version})"
+            if !@@user_agent
+                platform = System.get_property('platform')
+                device = System.get_property('device_name')
+                version = System.get_property('os_version')
+                @@user_agent = "Mozilla-5.0 (#{platform}; #{device}; #{version})"
+            end
+            hdrs['User-Agent'] =  @@user_agent   
           end
 
           auth = make_auth_header(args)
           hdrs['Authorization'] = auth unless auth.nil?
 
-          hdrs
+          args[:headers] = hdrs
         end
 
-	def self.process_result(res, callback)
+        def self.check_ssl_verify_peer(args)
+            ret = args[:ssl_verify_peer]
+            ret = true if !ret.is_a? TrueClass and !ret.is_a? FalseClass
+            args[:ssl_verify_peer] = ret ? 1 : 0
+        end
+
+	    def self.process_result(res, callback)
             return res if callback && callback.length() > 0
             
             _params = ::Rho::RhoSupport::parse_query_parameters res
             ::Rho::RhoController.process_rho_object(_params)
             _params
         end
-        
+
         def self.get(args)
-            process_result( 
-                AsyncHttp.do_get(args[:url], headers(args),
-                    args[:callback], args[:callback_param], ssl_verify_peer(args) ), args[:callback] )
+            preprocess_headers(args)
+            check_ssl_verify_peer(args)
+            process_result( AsyncHttp.do_request("GET", args ), args[:callback] )
         end
         def self.post(args)
-            process_result( 
-                AsyncHttp.do_post(args[:url], headers(args), args[:body],
-                    args[:callback], args[:callback_param], ssl_verify_peer(args) ), args[:callback] )
+            preprocess_headers(args)
+            check_ssl_verify_peer(args)
+            process_result( AsyncHttp.do_request("POST", args ), args[:callback] )
         end
         def self.download_file(args)
-            process_result( 
-                AsyncHttp.do_downloadfile(args[:url], headers(args), args[:filename],
-                    args[:callback], args[:callback_param], ssl_verify_peer(args) ), args[:callback] )
+            preprocess_headers(args)
+            check_ssl_verify_peer(args)
+            process_result( AsyncHttp.do_request("Download", args ), args[:callback] )
         end
         def self.upload_file(args)
-            process_result( 
-                AsyncHttp.do_uploadfile(args[:url], headers(args), args[:body], args[:filename],
-                    args[:callback], args[:callback_param], ssl_verify_peer(args) ), args[:callback] )
+            preprocess_headers(args)
+            check_ssl_verify_peer(args)
+            process_result( AsyncHttp.do_request("Upload", args ), args[:callback] )
         end
+        
     end
   
 end # Rho
 
+module SyncEngine
+    def self.search(args)
+        searchParams = ""
+
+        searchParams += '&offset=' + Rho::RhoSupport.url_encode(args[:offset]) if args[:offset]
+        searchParams += '&max_results=' + Rho::RhoSupport.url_encode(args[:max_results]) if args[:max_results]
+
+        callbackParams = args[:callback_param] ? args[:callback_param] : ""
+
+        if args[:search_params]
+            args[:search_params].each do |key,value|
+              searchParams += '&' + "search[#{Rho::RhoSupport.url_encode(key)}]" + '=' + Rho::RhoSupport.url_encode(value)
+              callbackParams += '&' + "search_params[#{Rho::RhoSupport.url_encode(key)}]" + '=' + Rho::RhoSupport.url_encode(value)
+            end  
+        end
+
+        SyncEngine.dosearch( args[:source_names], args[:from] ? args[:from] : 'search',
+            searchParams, args[:sync_changes] ? args[:sync_changes] : false, args[:progress_step] ? args[:progress_step] : -1,
+            args[:callback], callbackParams )
+    end
+end
+
 #at_exit do
 	#::Rhom::RhomDbAdapter.close
 #end

data/lib/framework/rho/rhoapplication.rb

@@ -34,15 +34,23 @@ module Rho
 	      NativeBar.create(TOOLBAR_TYPE, @@toolbar)
       else
         NativeBar.create(NOBAR_TYPE, [])
-	  end
+      end
 	  
-	  ::Rho::RHO.get_instance().check_source_migration(self)
-          
+      ::Rho::RHO.get_instance().check_source_migration(self)
+
+      @initialized = true
+    end
+
+    def initialized?
+      @initialized
     end
     
     def on_activate_app
     end
 
+    def on_deactivate_app
+    end
+
     # works for schema sources
     #return true to run script creating table    
     def on_migrate_source(old_version, new_src)

data/lib/framework/rho/rhocontact.rb

@@ -92,11 +92,14 @@ module Rho
 			def select_by_name(first_last_name, &block)
 				if @contacts.nil?
 					@contacts = find(:all).to_a.sort! do |x,y|
-						x[1]['first_name'] + " " + x[1]['last_name'] <=> y[1]['first_name'] + " " + y[1]['last_name']
+						xname = (x[1]['first_name'] or "") + " " + (x[1]['last_name'] or "")
+						yname = (y[1]['first_name'] or "") + " " + (y[1]['last_name'] or "")
+						xname <=> yname
 					end
 				end
+
 				range = @contacts.bsearch_range do |x|
-					x[1]['first_name'] + " " + x[1]['last_name'] <=> first_last_name
+					(x[1]['first_name'] or "") + " " + (x[1]['last_name'] or "") <=> first_last_name
 				end
 				found = @contacts[range]
 				unless found.nil? or block.nil?

data/lib/framework/rho/rhosupport.rb

@@ -60,9 +60,9 @@ module Rho
         return {} if query_string.nil?
 
         pairs = query_string.split('&').collect do |chunk|
-          next if chunk.empty?
+          next if !chunk || chunk.empty?
           key, value = chunk.split('=', 2)
-          next if key.empty?
+          next if !key || key.empty?
           value = value.nil? ? nil : form_decode(value)
           [ form_decode(key), value ]
         end.compact

data/lib/framework/rho/rhoutils.rb

@@ -4,7 +4,7 @@ module Rho
   class RhoUtils
     @@mapSrc = nil
     @@mapSrcByIdx = nil
-    def self.load_offline_data(tables=[], dir_prefix=nil)
+    def self.load_offline_data(tables=[], dir_prefix=nil, source_map=nil)
       columns = []
       tables.each do |filename|
     
@@ -28,7 +28,7 @@ module Rho
         cur_src = nil
         hashItem = {}
         cur_objid = nil
-        File.open(File.join(Rho::RhoFSConnector.get_base_app_path,'app',prefix,'fixtures',filename+'.txt')).each do |line|
+        File.open(File.join(Rho::RhoFSConnector.get_base_app_path(),'app',prefix,'fixtures',filename+'.txt')).each do |line|
           if first_row
             columns = line.chomp.split('|'); first_row = false; next;
           end
@@ -37,7 +37,9 @@ module Rho
           row = {}
           columns.each_with_index do |col,idx| 
             if col == 'source_name'
-              row['source_id'] = @@mapSrc[parts[idx]].source_id()
+              src_name = parts[idx]
+              src_name = source_map[src_name] if source_map
+              row['source_id'] = @@mapSrc[src_name].source_id()
             else
               row[col] = parts[idx]
             end
@@ -95,7 +97,7 @@ module Rho
         prefix = dir_prefix.nil? ? "" : dir_prefix
         query = ""
         
-        File.open(File.join(Rho::RhoFSConnector.get_base_app_path,'app',prefix,'fixtures',filename+'.txt')).each do |line|
+        File.open(File.join(Rho::RhoFSConnector.get_base_app_path(),'app',prefix,'fixtures',filename+'.txt')).each do |line|
           if row_index == 0
             columns = line.chomp.split('|')
             quests = ""

data/lib/framework/rhodes.rb

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

data/lib/framework/rhoframework.rb

@@ -21,9 +21,10 @@ begin
     require 'indifferent_access'
     require 'rho/rhosupport'    
     require 'rho/rhocontroller'    
-    require 'rho/render'
 
     require 'rho/rho'
+    require 'rho/render'
+    
     require 'rho'
 	
     puts 'RHO loaded'

data/lib/framework/rholang/lang_es.rb

@@ -0,0 +1,120 @@
+# lang_en.rb
+# English baseline translation file. Comes in handy for testing purposes
+# translated by : Raul Mantilla Assia
+
+
+
+module LocalizationSimplified
+  About = {
+    :lang => "es",
+    :updated => "2010-08-30"
+  }
+
+  class ActiveRecord
+    # ErrorMessages to override default messages in 
+    # +ActiveRecord::Errors::@@default_error_messages+
+    # This plugin also replaces hardcoded 3 text messages 
+    # :error_translation is inflected using the Rails 
+    # inflector. 
+    #
+    # Remember to modify the Inflector with your localized translation
+    # of "error" and "errors" in the bottom of this file
+    # 
+    ErrorMessages = {
+      :inclusion           => "no esta incluido en la lista",
+      :exclusion           => "es reservada",
+      :invalid             => "es invalida",
+      :confirmation        => "no coincide con la confirmación",
+      :accepted            => "debe ser aceptada",
+      :empty               => "no puede estar vacío",
+      :blank               => "no puede estar en blanco",# alternate formulation: "is required"
+      :too_long            => "es demasiado largo (el máximo es de %d caracteres)",
+      :too_short           => "es demasiado corto (el mínimo es de %d caracteres)",
+      :wrong_length        => "es de longitud incorrecta (debe ser de %d caracteres)",
+      :taken               => "ya ha sido tomada",
+      :not_a_number        => "no es un número",
+      #Jespers additions:
+      :error_translation   => "error",
+      :error_header        => "%s prohibido %s para ser guardado",
+      :error_subheader     => "Hubo problemas con los siguientes campos:"
+    }
+  end
+
+  # Texts to override +distance_of_time_in_words()+
+  class DateHelper
+    Texts = {
+      :less_than_x_seconds => "menos de %d segundos",
+      :half_a_minute       => "medio minuto",
+      :less_than_a_minute  => "menos de un minuto",
+      :one_minute          => "1 minuto",
+      :x_minutes           => "%d minutos",
+      :one_hour            => "alrededor de 1 hora",
+      :x_hours             => "alrededor de %d horas",
+      :one_day             => "1 día",
+      :x_days              => "%d días",
+      :one_month           => "1 mes",
+      :x_months            => "%d meses",
+      :one_year            => "1 año",
+      :x_years             => "%d años"
+    }
+
+    # Rails uses Month names in Date and time select boxes 
+    # (+date_select+ and +datetime_select+ )
+    # Currently (as of version 1.1.6), Rails doesn't use daynames
+    Monthnames     = [nil] + %w{Enero Febrero Marzo Abril Mayo Junio Julio Agosto Septiembre Octubre Noviembre Diciembre}
+    AbbrMonthnames = [nil] + %w{Ene Feb Mar Abr May Jun Jul Ago Sep Oct Nov Dic}
+    Daynames       = %w{Domingo Lunes Martes Miércoles Jueves Viernes Sábado}
+    AbbrDaynames   = %w{Dom Lun Mar Mié Jue Vie Sab}
+    
+    # Date and time format syntax explained in http://www.rubycentral.com/ref/ref_c_time.html#strftime
+    # These are sent to strftime that Ruby's date and time handlers use internally
+    # Same options as php (that has a better list: http://www.php.net/strftime )
+    DateFormats = {
+      :default  => "%Y-%m-%d",
+      :short    => "%b %e",
+      :long     => "%B %e, %Y"
+    }
+
+    TimeFormats = {
+      :default  => "%a, %d %b %Y %H:%M:%S %z",
+      :short    => "%d %b %H:%M",
+      :long     => "%B %d, %Y %H:%M"
+    }
+    # Set the order of +date_select+ and +datetime_select+ boxes
+    # Note that at present, the current Rails version only supports ordering of date_select boxes
+    DateSelectOrder = {
+      :order    => [:year, :month, :day] #default Rails is US ordered: :order => [:year, :month, :day]
+    }
+  end
+
+  class NumberHelper
+    # CurrencyOptions are used as default for +Number#to_currency()+
+    # http://api.rubyonrails.org/classes/ActionView/Helpers/NumberHelper.html#M000449
+    CurrencyOptions = {
+      :unit      => "$",
+      :separator => ".",             #unit separator (between integer part and fraction part)
+      :delimiter => ",",             #delimiter between each group of thousands. Example: 1.234.567 
+      :order     => [:unit, :number] #order is at present unsupported in Rails
+      #to support for instance Danish format, the order is different: Unit comes last (ex. "1.234,00 dkr.")
+    }
+  end
+
+  class ArrayHelper
+    # Modifies +Array#to_sentence()+
+    # http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Array/Conversions.html#M000274
+    ToSentenceTexts = {
+      :connector => 'y',
+      :skip_last_comma => false
+    }
+  end
+end
+
+
+# Use the inflector below to pluralize "error" from
+# @@default_error_messages[:error_translation] above (if necessary)
+# Inflector.inflections do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person people'
+#   inflect.uncountable %w( information )
+# end

data/lib/framework/rholang/localization_simplified.rb

@@ -28,16 +28,13 @@ module LocalizationSimplified
       @@cur_locale = curLocale
       
       if check_exist
-        begin
-            require file + curLocale if Rho::file_exist?(file + curLocale + '.iseq')
-        rescue Exception => e
-            puts 'Could not load resources for locale: ' + curLocale.to_s
-            if curLocale != 'en'
-                begin
-                    puts 'Load english resources.'
-                    require file + 'en'  if Rho::file_exist?(file + 'en.iseq')
-                rescue Exception => e
-                end    
+        if Rho::file_exist?(file + curLocale + '.iseq')
+            require file + curLocale
+        else    
+            puts 'Could not find resources for locale: ' + curLocale.to_s if curLocale != 'en'
+            if curLocale != 'en' && Rho::file_exist?(file + 'en.iseq')
+                puts 'Load english resources.'
+                require file + 'en'
             end    
         end
       else

data/lib/framework/rholang/rhoerror_es.rb

@@ -0,0 +1,36 @@
+module Rho
+  class RhoError < Exception
+    def self.err_message(code)
+        if code == ERR_NETWORK
+            return "No se pudo establecer conexión de red."
+        elsif code == ERR_REMOTESERVER
+            return "El servidor ha devuelto un error."
+        elsif code ==  ERR_RUNTIME
+            return "La aplicación ha detectado un error y debe cerrarse."
+        elsif code ==  ERR_UNEXPECTEDSERVERRESPONSE
+            return "Sincronización con servidor devuelve una respuesta inesperada."
+        elsif code ==  ERR_DIFFDOMAINSINSYNCSRC
+            return "Todas las fuentes de sincronización debe ser de un dominio. Vuelva a instalar la aplicación."
+        elsif code ==  ERR_NOSERVERRESPONSE
+            return "No se pudo conectar al servidor de sincronización."
+        elsif code ==  ERR_CLIENTISNOTLOGGEDIN
+            return "El cliente no se encuetra logueado. La sincronización no se llevará a cabo."
+        elsif code ==  ERR_CUSTOMSYNCSERVER
+            return "No se pudo conectar al servidor de datos."
+        elsif code ==  ERR_UNATHORIZED
+            return "Ha introducido un usuario/contraseña invalido, por favor, inténtelo de nuevo."
+        elsif code ==  ERR_CANCELBYUSER
+            return "Operación fue cancelada por el usuario."
+        elsif code ==  ERR_SYNCVERSION
+            return "Conexión terminada por el servidor. Su aplicación móvil debe ser actualizada. Por favor, contacte con su administrador."
+        elsif code ==  ERR_GEOLOCATION
+            return "La ubicación no se pudo determinar."
+        elsif code ==  ERR_NONE
+            return ""
+        end
+        
+        return "Error desconocido"
+    end
+    
+  end # RhoError
+end # Rho

data/lib/framework/rholang/rhomsg_es.rb

@@ -0,0 +1,28 @@
+module Rho
+  class RhoMessages
+    LocalMessages = {
+      'sync_failed_for' => "Error de sincronización  ",
+      'details'         => " Detalles: ",
+      'sync_completed'  => "Sincronización completada.",
+      'syncronizing'    => "Sincronizando ",
+      'syncronizing_data' => "Sincronizando datos...",
+      
+	  'home_menu' => "Inicio",
+	  'refresh_menu' => "Actualizar",
+	  'back_menu' => "Atrás <Esc>",
+	  'sync_menu' => "Sincronizar",
+	  'options_menu' => "Opciones",
+	  'log_menu' => "Log",
+	  'close_menu' => "Cerrar",
+      'get_link_menu' => "Obtener vínculo",
+      'open_link_menu' => "Obtener vínculo",
+      'email_menu' => "Email",
+      'call_menu' => "Llamar",
+      'sms_menu' => "SMS",
+      'add_contacts_menu' => "Agregar a libreta",
+      
+      'hide' => 'Ocultar'
+    }
+    
+  end # RhoMessages
+end # Rho