rhodes 2.3.2 → 2.4.0.beta.1

data/lib/framework/rho/render.rb

@@ -24,7 +24,14 @@ module Rho
 
     def self.renderfile(filename, req = {}, res = {})
       res = ""
-      if File.extname(filename) == '.iseq'
+	  if defined?(RHO_WP7)
+		if File.extname(filename) == '.iseq'
+			filename = filename[0,filename.length-5] + '.rb'
+		end
+	  end
+
+	  render_ext = defined?(RHO_WP7) ? '.rb' : '.iseq'
+      if File.extname(filename) == render_ext
         res = (RhoController.new).inst_render_index(filename, req, res)
       else
         res = IO.read(filename)

data/lib/framework/rho/rho.rb

@@ -11,12 +11,11 @@ module Rho
     RHO.get_instance().get_app('app')
   end
 
-  def self.file_exist?(fname)
-      return File.exist_injar?(fname) if defined? RHO_ME
-            
-      File.exist?(fname)
+  def self.support_transitions?()
+	is_bb6 = System::get_property('platform') == 'Blackberry' && (System::get_property('os_version') =~ /^6\.0/)
+    System::get_property('platform') == 'APPLE' || System::get_property('platform') == 'ANDROID' || is_bb6
   end
-  
+
   class RHO
     APPLICATIONS = {}
     APPNAME = 'app'
@@ -1051,7 +1050,7 @@ module Rho
       
       @@g_base_temp_id = nil
       def generate_id
-        @@g_base_temp_id = ((Time.now.to_f - Time.mktime(2009,"jan",1,0,0,0,0).to_f) * 10**6).to_i unless @@g_base_temp_id
+        @@g_base_temp_id = ((Time.now.to_f - Time.mktime(2009,"jan",1,0,0,0,0).to_f) * 10**6) unless @@g_base_temp_id
         
         @@g_base_temp_id = @@g_base_temp_id + 1
         @@g_base_temp_id
@@ -1134,7 +1133,17 @@ module Rho
         end
         
     end
-  
+
+    module Timer
+        def self.start( interval_ms, callback, callback_data )
+            System.start_timer(interval_ms, callback, callback_data)
+        end
+        
+        def self.stop( callback )
+            System.stop_timer( callback )
+        end        
+    end
+      
 end # Rho
 
 module SyncEngine
@@ -1143,8 +1152,22 @@ module SyncEngine
     end
     
     def self.on_sync_create_error( src_name, objects, action )
+        raise ArgumentError, 'on_sync_create_error src_name should be string' unless src_name.is_a?(String)
+        
         Object.const_get(src_name).on_sync_create_error(objects, action)
     end
+
+    def self.on_sync_update_error( src_name, objects, action )
+        raise ArgumentError, 'on_sync_update_error src_name should be string' unless src_name.is_a?(String)
+    
+        Object.const_get(src_name).on_sync_update_error(objects, action)
+    end
+
+    def self.on_sync_delete_error( src_name, objects, action )
+        raise ArgumentError, 'on_sync_delete_error src_name should be string' unless src_name.is_a?(String)
+    
+        Object.const_get(src_name).on_sync_delete_error(objects, action)
+    end
     
     def self.search(args)
         searchParams = ""

data/lib/framework/rho/rhoapplication.rb

@@ -81,9 +81,8 @@ module Rho
     end
 
     def on_ui_created
-        start_url = ""
-        start_url = Rho::RhoConfig.LastVisitedPage if Rho::RhoConfig.KeepTrackOfLastVisitedPage
-        start_url = Rho::RhoConfig.start_path if start_url.nil? || start_url.length() == 0
+        start_url = Rho::RhoConfig.start_path
+        start_url = "" unless start_url
         
         puts "on_ui_created.navigate to start url: '#{start_url}'"
 		WebView.navigate(start_url)
@@ -138,6 +137,10 @@ module Rho
       def get_blob_folder()
         Rho::RhoFSConnector::get_blob_folder()
       end
+
+      def get_public_folder()
+        Rho::RhoFSConnector::get_public_folder()
+      end
       
       def get_blob_path(relative_path)
         Rho::RhoFSConnector::get_blob_path(relative_path)      
@@ -149,7 +152,9 @@ module Rho
       req[:modelpath] = self.class.get_model_path req['application'], req['model']
       controller_class = req['model']+'Controller'
       undercase = controller_class.split(/(?=[A-Z])/).map{|w| w.downcase}.join("_")
-
+	  undercase.slice!(0) if undercase.start_with?('_')
+	  #TODO: WP7 - for some reason it added _ at the start
+	  	
       if Rho::file_exist?(  req[:modelpath]+ undercase +'.iseq' )
         require req['model'] + '/' + undercase #req[:modelpath]+ undercase
       else

data/lib/framework/rho/rhofsconnector.rb

@@ -31,7 +31,11 @@ module Rho
       def get_blob_folder()
         File.join(__rhoGetCurrentDir(), 'db/db-files')
       end
-      
+
+      def get_public_folder()
+        File.join(__rhoGetCurrentDir(), 'apps/public')
+      end
+
       def get_blob_path(relative_path)
         cur_dir = __rhoGetCurrentDir()
         if cur_dir && cur_dir.length()>0

data/lib/framework/rho/rhotabbar.rb

@@ -23,6 +23,14 @@ class NativeTabbar
     NativeBar.native_tabbar_set_tab_badge(tab_index, value)
   end
 
+  def self.get_current_tab
+      if System::get_property('platform') == 'APPLE' or System::get_property('platform') == 'ANDROID'
+          return NativeBar.native_tabbar_get_current_tab
+      else 
+          return 0
+      end
+  end
+
 end
  
  

data/lib/framework/rho/rhotoolbar.rb

@@ -3,7 +3,7 @@ module Rho
  
 class NativeToolbar
  
-  def self.create(params)
+  def self.create(params)  
     NativeBar.create_native_toolbar(Rho::RhoApplication::TOOLBAR_TYPE, params)
   end
  

data/lib/framework/rho/rhoviewhelpers.rb

@@ -116,7 +116,7 @@ module Rho
       amurl << '/' << application.to_s << '/' if application
       amurl << model.to_s
 
-      if action.nil? or action == 'create' or action == 'index'  
+      if action.nil? or ( !defined?(RHO_WP7) && action == 'create') or action == 'index'  
         amurl << query << fragment 
       else
         amurl << '/' << (id.nil? ? action : id + '/' + action) << query << fragment          
@@ -130,6 +130,23 @@ module Rho
       #return amurl +'/'+ (id.nil? ? action : id + '/' + action) + query + fragment
     end
 
+
+   def url_for_nativeview(params = {})
+      return params.to_s if params.is_a?( String ) or params.is_a?( Symbol )
+      return '/' if not params.is_a?( Hash ) or params.nil?
+
+      params = params.symbolize_keys if params.is_a? Hash
+
+      name = params[:name] 
+      param = params[:param] 
+      
+      amurl = ''
+
+      amurl << name << ':' << param
+
+      amurl
+   end
+
   private
     def query_to_s(query)
       return '' if query.nil?

data/lib/framework/rhodes.rb

@@ -1,6 +1,6 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '2.3.2'
+    VERSION = '2.4.0'
   end
   unless defined? Rhodes::DBVERSION
     DBVERSION = '2.2.0'

data/lib/framework/rhoframework.rb

@@ -1,4 +1,49 @@
+module Rho
+  def self.file_exist?(fname)
+      return File.exist_injar?(fname) if defined? RHO_ME
+
+	  if defined? RHO_WP7
+	     if fname.end_with?('_erb.iseq')
+			fname = fname[0,fname.length-9] + '_erb.rb'
+		 elsif fname.end_with?('.iseq')
+			fname = fname[0,fname.length-5] + '.rb'
+		 end
+	  end
+	              
+      File.exist?(fname)
+  end
+end
+
+if defined? RHO_WP7
+
+module Kernel   
+	def __rhoGetCurrentDir
+		""
+	end
+
+	alias :orig_require :require
+
+	def require(file_name)
+		 file_name += '.rb' unless file_name.end_with?('.rb')
+		 orig_require( file_name )
+	end
+
+	def eval_compiled_file(fname, bind)
+		if fname.end_with?('_erb.iseq')
+			fname = fname[0,fname.length-9] + '_erb.rb'
+		end
+
+	    code = IO.read(fname)
+		eval(code, bind)
+	end
+end
+
+end
+
 begin
+	if defined? RHO_WP7
+		require 'rhosystem'
+	end
 
     if defined? RHO_ME
 	    require 'rationalME'
@@ -28,7 +73,7 @@ begin
     require 'rho'
 	
     puts 'RHO loaded'
-    Rho::RHO.new
+    RHO_FRAMEWORK = Rho::RHO.new
 rescue Exception => e
     trace_msg = e.backtrace.join("\n")
     puts 'Create RHO framework failed: ' + e.inspect + ";Trace: #{trace_msg}"

data/lib/framework/rholang/localization_simplified.rb

@@ -22,30 +22,31 @@ module LocalizationSimplified
     @@cur_locale  
   end
   
-  def self.requre_loc(file,check_exist)
-      curLocale = System::get_locale()
-      puts 'Current locale: ' + curLocale.to_s
-      @@cur_locale = curLocale
+    def self.requre_loc(file,check_exist)
+        curLocale = System::get_locale().downcase
+        curCountry = System::get_property("country").downcase
+
+        puts "Current locale: #{curLocale}; Country code: #{curCountry}"
+        @@cur_locale = curLocale
+
+        unless check_exist
+            file = File.join( __rhoGetCurrentDir(), "lib", file)
+            puts "file: #{file}"
+        end
       
-      if check_exist
-        if Rho::file_exist?(file + curLocale + '.iseq')
+        if curCountry && curCountry.length() > 0 && Rho::file_exist?(file + curLocale + '_' + curCountry + '.iseq') 
+            require file + curLocale + '_' + curCountry
+        elsif Rho::file_exist?(file + curLocale + '.iseq')
             require file + curLocale
         else    
-            puts 'Could not find resources for locale: ' + curLocale.to_s if curLocale != 'en'
+            puts 'Could not find resources for locale: ' + curLocale.to_s + ";file: #{file}"if curLocale != 'en'
             if curLocale != 'en' && Rho::file_exist?(file + 'en.iseq')
                 puts 'Load english resources.'
                 require file + 'en'
             end    
         end
-      else
-        begin
-            require file + curLocale
-        rescue Exception => e
-            puts 'Could not load locale: ' + curLocale.to_s + '. Load english.'
-            require file + 'en' unless curLocale == 'en'
-        end
-      end
-  end
+    end
+  
 end
 
 LocalizationSimplified.requre_loc('rholang/lang_',false)

data/lib/framework/rhom/rhom_db_adapter.rb

@@ -215,7 +215,7 @@ class RhomDbAdapter
   
     raise ArgumentError if !table || !columns
     query = nil
-    vals = nil
+    vals = []
 
     if condition
         quests,vals = RhomDbAdapter.make_where_params(condition,'AND') 
@@ -312,7 +312,7 @@ class RhomDbAdapter
   def update_into_table(table=nil,values=nil,condition=nil)
     raise ArgumentError if !table || !values
     query = nil
-    vals = nil
+    vals = []
     if condition
         quests_set, vals_set = make_set_params(values)
         quests_where,vals_where = RhomDbAdapter.make_where_params(condition,'AND') 

data/lib/framework/rhom/rhom_object_factory.rb

@@ -164,12 +164,12 @@ module Rhom
                 end
                 
                 def get_source_id
-                  Rho::RhoConfig.sources[get_source_name]['source_id'].to_s
+                  Rho::RhoConfig.sources[get_source_name]['source_id'].to_i
                 end
 
                 def convertOpToStr(val_op, value)
                     res = ""
-                    if val_op == 'IN' or val_op == 'in'
+                    if val_op.upcase == 'IN'
                     
                         if value.is_a?(String)
                             value = value.split(",")
@@ -333,10 +333,16 @@ module Rhom
                     else
                         attrib_name = key
                     end
-                    
-                    sql << "attrib=" + ::Rhom::RhomDbAdapter.get_value_for_sql_stmt(attrib_name)
+
+                    sql << "attrib=" + ::Rhom::RhomDbAdapter.get_value_for_sql_stmt(
+                        val_func.upcase == 'CAST' ? attrib_name.split(' ')[0] : attrib_name)
                     sql << " AND source_id=" + srcid_value 
-                    sql << " AND " + (val_func.length > 0 ? val_func + "(value)" : "value") + ' '
+                    
+                    if val_func.upcase == 'CAST'
+                        sql << " AND " + val_func + "(value " + attrib_name.split(' ')[1] + ' ' + attrib_name.split(' ')[2] + " ) "
+                    else                    
+                        sql << " AND " + (val_func.length > 0 ? val_func + "(value)" : "value") + ' '
+                    end
                     
                     sql << convertOpToStr(val_op, value)
                     
@@ -362,11 +368,17 @@ module Rhom
                     if srcid_value.nil?
                         sql << (val_func.length > 0 ? val_func + "(#{attrib_name})" : "#{attrib_name}") + ' '
                     else
-                        sql << "attrib=?"
-					    vals << attrib_name
+                        sql << "attrib=?"                    
+					    vals << (val_func.upcase == 'CAST' ? attrib_name.split(' ')[0] : attrib_name)
+					    
                         sql << " AND source_id=?"
-					    vals << srcid_value					
-                        sql << " AND " + (val_func.length > 0 ? val_func + "(value)" : "value") + ' '
+					    vals << srcid_value
+
+                        if val_func.upcase == 'CAST'
+                            sql << " AND " + val_func + "(value " + attrib_name.split(' ')[1] + ' ' + attrib_name.split(' ')[2] + " ) "
+                        else
+                            sql << " AND " + (val_func.length > 0 ? val_func + "(value)" : "value") + ' '
+                        end    
                     end
                     
                     if val_op == 'IN' or val_op == 'in'
@@ -1049,6 +1061,26 @@ module Rhom
                   ret_list
                 end
               
+                def find_by_sql(sql_query)
+                    raise ArgumentError, 'find_by_sql only works with FixedSchema models' if !is_schema_source
+                    
+                    db = ::Rho::RHO.get_src_db(get_source_name)
+                    list = db.execute_sql(sql_query)
+
+                    ret_list = []
+                    list.each do |rowhash|
+                        new_obj = self.new({:object=>"#{rowhash['object']}"})
+
+                        rowhash.each do |attrName, attrVal|
+                            new_obj.vars.merge!( { attrName.to_sym()=>attrVal } ) if attrVal
+                        end
+
+                        ret_list << new_obj
+                    end
+                    
+                    ret_list
+                end
+                
                 def search(args)
                     args[:source_names] = [self.name.to_s]
 
@@ -1089,11 +1121,82 @@ module Rhom
                   SyncEngine.clear_notification(get_source_id.to_i)
                 end
 
+                def on_sync_delete_error( objects, action )
+                    raise ArgumentError, 'on_sync_delete_error action should be :retry' unless action == :retry
+                    return  unless is_sync_source()
+
+                    nSrcID = get_source_id()
+                    db_partition = Rho::RhoConfig.sources[get_source_name]['partition'].to_s
+                    
+                    db = ::Rho::RHO.get_src_db(get_source_name)                            
+                    db.start_transaction
+                    
+                    begin                    
+                        objects.each do |obj, values|
+                          values['attributes'].each do |attrib, value|
+                          
+                              resUpdateType =  db.select_from_table('changed_values', 'update_type', 
+                                {"object"=>obj, "source_id"=>nSrcID, "attrib"=>attrib, 'sent'=>0})
+                              next if resUpdateType && resUpdateType.length > 0 
+                          
+                              attrib_type = SyncEngine.is_blob_attr(db_partition, nSrcID,attrib)  ? "blob.file" : ""
+                              db.insert_into_table('changed_values', {"source_id"=>nSrcID, "object"=>obj, "attrib"=>attrib, 
+                                "value"=>value, "update_type"=>'delete', "attrib_type"=>attrib_type })
+                          end      
+                        end
+                        db.commit
+                    rescue Exception => e
+                        puts 'on_sync_delete_error Exception: ' + e.inspect
+                        db.rollback
+
+                        raise    
+                    end                    
+                    
+                end
+
+                def on_sync_update_error( objects, action )
+                    raise ArgumentError, 'on_sync_update_error action should be :retry' unless action == :retry
+                    return  unless is_sync_source()
+
+                    nSrcID = get_source_id()
+                    db_partition = Rho::RhoConfig.sources[get_source_name]['partition'].to_s
+                    
+                    db = ::Rho::RHO.get_src_db(get_source_name)                            
+                    db.start_transaction
+
+                    begin                    
+                        objects.each do |obj, values|
+                          values['attributes'].each do |attrib, value|
+                          
+                              resUpdateType =  db.select_from_table('changed_values', 'update_type', 
+                                {"object"=>obj, "source_id"=>nSrcID, "attrib"=>attrib, 'sent'=>0})
+                              next if resUpdateType && resUpdateType.length > 0 
+                          
+                              attrib_type = SyncEngine.is_blob_attr(db_partition, nSrcID,attrib)  ? "blob.file" : ""
+                              db.insert_into_table('changed_values', {"source_id"=>nSrcID, "object"=>obj, "attrib"=>attrib, 
+                                "value"=>value, "update_type"=>'update', "attrib_type"=>attrib_type })
+                          end      
+                        end
+                        db.commit
+                    rescue Exception => e
+                        puts 'on_sync_update_error Exception: ' + e.inspect
+                        db.rollback
+
+                        raise    
+                    end                        
+                end
+                
                 def on_sync_create_error( objects, action )
-                    raise ArgumentError, 'on_create_error action should be :delete or :recreate' unless action == :delete || action == :recreate
+                    raise ArgumentError, 'on_sync_create_error action should be :delete or :recreate' unless action == :delete || action == :recreate
                     return  unless is_sync_source()
                     
-                    ar_objs = objects.is_a?(Array) ? objects : [objects]
+                    ar_objs = objects
+                    if objects.is_a?(Hash)
+                        ar_objs = objects.keys()
+                    elsif !objects.is_a?(Array)
+                        ar_objs = [objects]
+                    end
+                        
                     puts "ar_objs : #{ar_objs}"
                     tableName = is_schema_source() ? get_schema_table_name : 'object_values'
                     nSrcID = get_source_id()
@@ -1610,7 +1713,7 @@ module Rhom
               end
 	
               def get_inst_source_id
-                Rho::RhoConfig.sources[get_inst_source_name]['source_id'].to_s
+                Rho::RhoConfig.sources[get_inst_source_name]['source_id'].to_i
               end
           
               def is_inst_sync_source