rhodes 2.0.0.beta7 → 2.0.0.beta8

data/CHANGELOG

@@ -1,9 +1,28 @@
 == 2.0.0
 * client support of sync protocol 3 with rhosync 2.0
 * partial support
-* callback calls from menu ad toolbar
+* callback calls from menu and toolbar
 * installing.html(png for android)
 * implement extended Alerts
+* support of :center and :radius parameters for MapView
+* new WebView.set_cookie method
+* added native navigation bar for iPhone and Android
+* full support of native extensions on Android (including Java)
+* new properties added for System.get_property: country, locale, device_name,
+  os_version, ppi_x, ppi_y
+* AsyncHttp now send requests with User-Agent indicating mobile platform, OS
+  and device name
+* 'sms:' uri supported for Android
+* implemented dynamic menu on Android
+* right handle video uri (open native video player) on Android
+* support of capabilities for applications (gps, camera, vibrate etc)
+* native toolbar for Android
+* fix GPS on application start issue (iPhone and Android)
+* AsyncHttp support basic authentication
+* fixed wrong url escaping on iPhone
+* suport of parallel build for Android (on multi-core cpus)
+* NativeBar.create now re-use WebView so no more need to call WebView.navigate
+  after NativeBar.create
 
 == 1.5.4
 * Fix issue #3132788 - rake clean:iphone fails

data/bin/rhodes-setup

@@ -76,9 +76,13 @@ Dir.glob(File.join(android, 'platforms', '*')).each do |dir|
 end
 android = "" if apilevel == -1
 
-android = prompt_for("Android 1.5 SDK path", android, false, android_platform_dir)
+android = prompt_for("Android SDK path", android, false, android_platform_dir)
 
-androidndk = prompt_for("Android NDK path", "",false)
+# try to detect android ndk
+ndks = Dir.glob(File.dirname(android) + "/android-ndk-*").sort
+ndk = ""
+ndk = ndks.last if ndks.size > 0
+androidndk = prompt_for("Android NDK path", ndk, false)
 
 #now cabwiz
 cabwiz = ""

data/lib/extensions/digest/ext/Rakefile

@@ -72,8 +72,8 @@ namespace "build" do
     raise "TARGET_TEMP_DIR is not set" if $targetdir.nil?
     $tempdir = ENV['TEMP_FILES_DIR']
     raise "TEMP_FILES_DIR is not set" if $tempdir.nil?
-    $rootdir = ENV['RHODES_ROOT_DIR']
-    raise "RHODES_ROOT_DIR is not set" if $rootdir.nil?
+    $rootdir = ENV['RHO_ROOT']
+    raise "RHO_ROOT is not set" if $rootdir.nil?
 
     if ENV['RHO_PLATFORM'] == 'android'
       require File.join($rootdir, 'platform/android/build/androidcommon.rb')

data/lib/framework/rho/render.rb

@@ -157,6 +157,8 @@ module Rho
       options = options.symbolize_keys
 
       localclass = Class.new do
+        require 'helpers/application_helper'
+        include ApplicationHelper
         def initialize(obj=nil)
           @vars = {}
           if obj

data/lib/framework/rho/rho.rb

@@ -157,46 +157,52 @@ module Rho
     def load_server_sources(data)
         puts "load_server_sources : #{data}"
         
-        res = Rho::JSON.parse(data)
-        if res['partition']
-            str_partition = res['partition']
-            puts "reload sources for partition: #{str_partition}"
-            db = @db_partitions[ str_partition ]
-
-            puts "sources before: #{Rho::RhoConfig::sources()}"
-            
-            Rho::RhoConfig::sources().delete_if {|key, value| value['partition']==str_partition }
-            arSrcs = db.select_from_table('sources','source_id, name, sync_priority, partition, sync_type, schema, schema_version, associations, blob_attribs',
-                {'partition'=>str_partition} )
-            arSrcs.each do |src|
-                Rho::RhoConfig::sources()[ src['name'] ] = src
+        begin
+            res = Rho::JSON.parse(data)
+            if res['partition']
+                str_partition = res['partition']
+                puts "reload sources for partition: #{str_partition}"
+                db = @db_partitions[ str_partition ]
+
+                puts "sources before: #{Rho::RhoConfig::sources()}"
+                
+                Rho::RhoConfig::sources().delete_if {|key, value| value['partition']==str_partition }
+                arSrcs = db.select_from_table('sources','source_id, name, sync_priority, partition, sync_type, schema, schema_version, associations, blob_attribs',
+                    {'partition'=>str_partition} )
+                arSrcs.each do |src|
+                    Rho::RhoConfig::sources()[ src['name'] ] = src
+                end
+                
+                puts "sources after: #{Rho::RhoConfig::sources()}"            
+                return
             end
             
-            puts "sources after: #{Rho::RhoConfig::sources()}"            
-            return
-        end
-        
-        arSrc = res['server_sources']
-        puts "arSrc: #{arSrc}"
-        return unless arSrc
-
-        hashSrcs = Rhom::RhomSource::find_all_ashash
-        puts "hashSrcs : #{hashSrcs}"
-        arSrc.each do |src|
-            oldSrc = hashSrcs[src['name']]
-            puts "oldSrc: #{oldSrc}"
-            if oldSrc
-                oldVer = oldSrc.schema_version
-                newVer = src['schema_version']
-                if ( oldVer != newVer )    
-                    get_app(APPNAME).on_migrate_source(oldSrc.schema_version, src)
+            arSrc = res['sources']
+            puts "arSrc: #{arSrc}"
+            return unless arSrc
+
+            hashSrcs = Rhom::RhomSource::find_all_ashash
+            puts "hashSrcs : #{hashSrcs}"
+            arSrc.each do |src|
+                oldSrc = hashSrcs[src['name']]
+                puts "oldSrc: #{oldSrc}"
+                if oldSrc
+                    oldVer = oldSrc.schema_version
+                    newVer = src['schema_version']
+                    if ( oldVer != newVer )    
+                        get_app(APPNAME).on_migrate_source(oldSrc.schema_version, src)
+                    end
                 end
+                
+                Rho::RhoConfig::add_source(src['name'], src)
             end
             
-            Rho::RhoConfig::add_source(src['name'], src)
-        end
-        
-        init_sources()
+            init_sources()
+      rescue Exception => e
+        puts "Error load_server_sources: #{e}"
+        puts "Trace: #{e.backtrace}"
+      end
+            
     end
 
     def find_src_byname(uniq_sources, src_name)
@@ -215,15 +221,19 @@ module Rho
         uniq_sources = Rho::RhoConfig::sources.values
         puts 'init_sources: ' + uniq_sources.inspect
 
+        uniq_sources.each do |source|
+            source['str_associations'] = ""    
+        end
+        
         uniq_sources.each do |source|
           partition = source['partition']
           @db_partitions[partition] = nil
           
-          if source['associations']
-            source['associations'].each do |src_name, attrib|    
+          if source['belongs_to']
+            source['belongs_to'].each do |attrib, src_name|    
                 associationsSrc = find_src_byname(uniq_sources, src_name)
                 if !associationsSrc
-                    puts ( "Error: associations from '#{source['name']}' : source name '#{src_name}' does not exist."  )
+                    puts ( "Error: belongs_to '#{source['name']}' : source name '#{src_name}' does not exist."  )
                     next
                 end
                 
@@ -239,12 +249,12 @@ module Rho
         
         #user partition should alwayse exist
         @db_partitions['user'] = nil
-        
+        hash_migrate = {}
         @db_partitions.each_key do |partition|
             db = Rhom::RhomDbAdapter.new(Rho::RhoFSConnector::get_db_fullpathname(partition), partition)
             db.start_transaction
             begin
-                init_db_sources(db, uniq_sources, partition)
+                init_db_sources(db, uniq_sources, partition,hash_migrate)
                 db.commit
             rescue Exception => e
                 puts "exception when init_db_sources: #{e}"    
@@ -254,69 +264,83 @@ module Rho
             @db_partitions[partition] = db
         end
         
-        ::Rho::RHO.init_schema_sources
+        ::Rho::RHO.init_schema_sources(hash_migrate)
     end
 
-    def self.processIndexes(index_param, src_name, is_unique)
+    def self.processIndexes(index_ar, src_name, is_unique)
 
-        return "" unless index_param
+        return "" unless index_ar
         
         strUnique = 'UNIQUE' if is_unique
         strRes = ""
-        if index_param.is_a?( String )
-            strRes = index_param
-        else
-            nInd = 0
-            index_param.each do |index_cols|
-                strCols = ""
-                index_cols.each do |col|
-                    strCols += ',' if strCols.length() > 0
-                    strCols += "\"#{col}\""
+        index_ar.each do |index_param|            
+        
+            if index_param.is_a?( String )
+                strRes = index_param
+            else
+                nInd = 0
+                
+                index_param.each do |index_name, index_cols|
+                    strCols = ""
+                    index_cols.each do |col|
+                        strCols += ',' if strCols.length() > 0
+                        strCols += "\"#{col}\""
+                    end
+
+                    #strIndName = "rhoIndex" + (is_unique ? "U" : "" ) + "_#{nInd}"
+                    strIndex = "CREATE #{strUnique} INDEX \"#{index_name}\" on #{src_name} (#{strCols});\r\n"
+                    strRes += strIndex
+                    nInd += 1
                 end
-
-                strIndName = "rhoIndex" + (is_unique ? "U" : "" ) + "_#{nInd}"
-                strIndex = "CREATE #{strUnique} INDEX \"#{strIndName}\" on #{src_name} (#{strCols});\r\n"
-                strRes += strIndex
-                nInd += 1
             end
         end
-        
         strRes
     end
         
-    def self.init_schema_sources
+    def self.init_schema_sources(hash_migrate)
         uniq_sources = Rho::RhoConfig::sources.values
         puts 'init_schema_sources'
         
         uniq_sources.each do |source|
           db = get_src_db(source['name'])
           
-          if  source['schema'] && !db.table_exist?(source['name'])
+          next unless source['schema'] && source['model_type'] == 'fixed_schema'
           
-            strCreate = source['schema']['sql']
-            if source['schema']['columns']
-                arCols = source['schema']['columns']
-                arCols = arCols
-                strCols = ""
-                arCols.each do |col|
-                    strCols += ',' if strCols.length() > 0
-                    strCols += "\"#{col}\" varchar default NULL"
-                end
-
-                strCols += ",object varchar(255) PRIMARY KEY"
-                strCreate = "CREATE TABLE #{source['name']} ( #{strCols} )"
+          call_migrate = false
+          if db.table_exist?(source['name'])
+            next unless hash_migrate[ source['name'] ]
+            call_migrate = true 
+          end
+          
+          strCreate = source['schema']['sql']
+          if source['schema']['property']
+            arCols = source['schema']['property']
+            arCols = arCols
+            strCols = ""
+            arCols.each do |col, type|
+                strCols += ',' if strCols.length() > 0
+                strCols += "\"#{col}\" varchar default NULL"
+                #TODO: support column type
             end
 
-            strCreate += ";\r\n" if strCreate && strCreate.length() > 0
-            strCreate += processIndexes(source['schema']['indexes'], source['name'], false)
-            strCreate += ";\r\n" if strCreate && strCreate.length() > 0
-            strCreate += processIndexes(source['schema']['unique_indexes'], source['name'], true)
-            
-            db.update_into_table('sources', {"schema"=>strCreate, "schema_version"=>source['schema_version']},{"name"=>source['name']})
-            
+            strCols += ",object varchar(255) PRIMARY KEY"
+            strCreate = "CREATE TABLE #{source['name']} ( #{strCols} )"
+          end
+
+          strCreate += ";\r\n" if strCreate && strCreate.length() > 0
+          strCreate += processIndexes(source['schema']['index'], source['name'], false)
+          strCreate += ";\r\n" if strCreate && strCreate.length() > 0
+          strCreate += processIndexes(source['schema']['unique_index'], source['name'], true)
+        
+          if call_migrate
+            db.update_into_table('sources', {"schema"=>strCreate},{"name"=>source['name']})
+            source['migrate_version'] = hash_migrate[ source['name'] ]
+            source['schema']['sql'] = strCreate
+          else
             db.execute_batch_sql(strCreate)
+            db.update_into_table('sources', {"schema"=>strCreate, "schema_version"=>source['schema_version']},{"name"=>source['name']})
           end
-          
+        
         end
     end
 
@@ -324,24 +348,27 @@ module Rho
       return source['str_blob_attribs'] if source['str_blob_attribs']
       source['str_blob_attribs'] = ""
       
-      if source['blob_attribs']
+      if source['schema'] && source['schema']['property']
         str = ""
-        source['blob_attribs'].each do |blobAttr|  
-            str += ',' if str.length()>0
-            if blobAttr.is_a?(Hash)    
-                str += blobAttr['name'].to_s() + ',' + blobAttr['server_overwrite'].to_i()
-            else
-                str += blobAttr.to_s() + ',0'
+        source['schema']['property'].each do |name, type|
+            if type && type.is_a?(Hash)
+                next unless type[:blob] || type['blob']
+                str += ',' if str.length()>0
+                str += name.to_s() + ',' + (type[:server_overwrite]||type[:server_overwrite].to_i() ? '1' : '0')
+            elsif type && type.to_s == 'blob'
+                str += ',' if str.length()>0
+                str += name.to_s() + ',0'
             end
         end
         
         source['str_blob_attribs'] = str
       end
-      
+            
       source['str_blob_attribs']
+      
     end
     
-    def init_db_sources(db, uniq_sources, db_partition)
+    def init_db_sources(db, uniq_sources, db_partition, hash_migrate)
     
         result = db.execute_sql("SELECT MAX(source_id) AS maxid FROM sources")
         #puts 'result: ' + result.inspect
@@ -355,10 +382,11 @@ module Rho
           partition = source['partition']
           sync_type = source['sync_type']
           schema_version = source['schema_version']
+          model_type = source['model_type']
           associations = source['str_associations']
           blob_attribs = process_blob_attribs(source, db)
           
-          attribs = db.select_from_table('sources','sync_priority,source_id,partition, sync_type, schema_version, associations, blob_attribs', {'name'=>name})
+          attribs = db.select_from_table('sources','sync_priority,source_id,partition, sync_type, schema_version, associations, blob_attribs, model_type', {'name'=>name})
 
           if attribs && attribs.size > 0 
             if attribs[0]['sync_priority'].to_i != sync_priority.to_i
@@ -368,7 +396,11 @@ module Rho
                 db.update_into_table('sources', {"sync_type"=>sync_type},{"name"=>name})
             end
             if attribs[0]['schema_version'] != schema_version
-                db.update_into_table('sources', {"schema_version"=>schema_version},{"name"=>name})
+                if db_partition == partition
+                    hash_migrate[name] = attribs[0]['schema_version']
+                else    
+                    db.update_into_table('sources', {"schema_version"=>schema_version},{"name"=>name})
+                end    
             end
             if attribs[0]['partition'] != partition
                 db.update_into_table('sources', {"partition"=>partition},{"name"=>name})
@@ -380,6 +412,10 @@ module Rho
                 db.update_into_table('sources', {"blob_attribs"=>blob_attribs},{"name"=>name})
             end
 
+            if attribs[0]['model_type'] != model_type
+                db.update_into_table('sources', {"model_type"=>model_type},{"name"=>name})
+            end
+
             if !source['source_id']
                 source['source_id'] = attribs[0]['source_id'].to_i
                 Rho::RhoConfig::sources[name]['source_id'] = attribs[0]['source_id'].to_i
@@ -395,7 +431,8 @@ module Rho
           
             db.insert_into_table('sources',
                 {"source_id"=>source['source_id'],"name"=>name, "sync_priority"=>sync_priority, "sync_type"=>sync_type, "partition"=>partition,
-                "schema_version"=>source['schema_version'], 'associations'=>associations, 'blob_attribs'=>blob_attribs })
+                "schema_version"=>source['schema_version'], 'associations'=>associations, 'blob_attribs'=>blob_attribs,
+                "model_type"=>model_type })
                 
           end
           
@@ -633,17 +670,28 @@ module Rho
       def add_source(modelname, new_source=nil)
         return if !modelname || modelname.length() == 0# || @@sources[modelname]
         
+        puts "#{modelname} : #{new_source}"
         @@sources[modelname] = new_source ? new_source.clone() : {}
         @@sources[modelname]['name'] ||= modelname
-        @@sources[modelname]['sync_priority'] ||= 1000
+        
+        if @@sources[modelname]['sync_priority']
+            @@sources[modelname]['sync_priority'] = @@sources[modelname]['sync_priority'].to_i()
+        else
+            @@sources[modelname]['sync_priority'] = 1000
+        end
+        
         if @@sources[modelname]['partition']
             @@sources[modelname]['partition'] = @@sources[modelname]['partition'].to_s
         else    
             @@sources[modelname]['partition'] ||= 'user'
         end    
         
-        @@sources[modelname]['sync_type'] = 'none' if !@@sources[modelname]['sync']
-        @@sources[modelname]['sync_type'] ||= 'incremental'
+        #@@sources[modelname]['sync_type'] = 'none' if !@@sources[modelname]['sync']
+        @@sources[modelname]['sync_type'] ||= 'none'
+        
+        if @@sources[modelname]['source_id']
+            @@sources[modelname]['source_id'] = @@sources[modelname]['source_id'].to_i()
+        end
         
         @@max_config_srcid = @@sources[modelname]['source_id'] if @@sources[modelname]['source_id'] && @@max_config_srcid < @@sources[modelname]['source_id']
       end
@@ -666,6 +714,19 @@ module Rho
             ret ? 1 : 0
         end
 
+        def self.make_auth_header(args)
+          auth = args[:authorization]
+          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?
+
+          plain = 'Basic ' + [auth[:username].to_s + ':' + auth[:password].to_s].pack('m')
+          # Remove trailing \n
+          plain[0..-2]
+        end
+
         def self.headers(args)
           hdrs = args[:headers]
           hdrs = {} if hdrs.nil?
@@ -677,6 +738,9 @@ module Rho
             hdrs['User-Agent'] = "Mozilla-5.0 (#{platform}; #{device}; #{version})"
           end
 
+          auth = make_auth_header(args)
+          hdrs['Authorization'] = auth unless auth.nil?
+
           hdrs
         end