rhodes 2.0.0.beta2 → 2.0.0.beta3

data/lib/framework/rho/rho.rb

@@ -10,6 +10,12 @@ module Rho
   def self.get_app
     RHO.get_instance().get_app('app')
   end
+
+  def self.file_exist?(fname)
+      return File.exist_injar?(fname) if defined? RHO_ME
+            
+      File.exist?(fname)
+  end
   
   class RHO
     APPLICATIONS = {}
@@ -85,7 +91,7 @@ module Rho
     
     def get_app(appname)
       if (APPLICATIONS[appname].nil?)
-        require RhoApplication::get_app_path(appname)+'application'
+        require 'application' #RhoApplication::get_app_path(appname)+'application'
         APPLICATIONS[appname] = Object.const_get('AppApplication').new
       end
       APPLICATIONS[appname]
@@ -96,8 +102,26 @@ module Rho
       File.open(app_manifest_filename).each do |line|
         str = line.chomp
         if str != nil and str.length > 0 
-            require File.join(File.dirname(app_manifest_filename), str )
-        end    
+            #puts "model file: #{str}"
+            modelName = File.basename(File.dirname(str))
+            Rhom::RhomObjectFactory.init_object(modelName)
+            require str
+
+            #puts "model name: #{modelName}"            
+
+            modelClass = Object.const_get(modelName)
+            if modelClass
+                if modelClass.respond_to?( :get_model_params )
+                    Rho::RhoConfig::add_source(modelName,modelClass.get_model_params())
+                    modelClass.reset_model_params()
+                else
+                    puts "ERROR: Invalid model definition. Add 'include Rhom::PropertyBag' or 'include Rhom::FixedSchema' to model class"
+                end    
+            else
+                puts "ERROR: cannot load model : #{modelClass}"
+            end    
+        end
+        
       end
     end
     
@@ -134,6 +158,24 @@ module Rho
         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
+            end
+            
+            puts "sources after: #{Rho::RhoConfig::sources()}"            
+            return
+        end
+        
         arSrc = res['server_sources']
         puts "arSrc: #{arSrc}"
         return unless arSrc
@@ -177,20 +219,20 @@ module Rho
           partition = source['partition']
           @db_partitions[partition] = nil
           
-          if source['links']
-            source['links'].each do |src_name, attrib|    
-                linkSrc = find_src_byname(uniq_sources, src_name)
-                if !linkSrc
-                    rho_error( "links from '#{source['name']}' : source name '#{src_name}' does not exist."  )
+          if source['associations']
+            source['associations'].each do |src_name, attrib|    
+                associationsSrc = find_src_byname(uniq_sources, src_name)
+                if !associationsSrc
+                    puts ( "Error: associations from '#{source['name']}' : source name '#{src_name}' does not exist."  )
                     next
                 end
                 
-                str_links = linkSrc['str_links']
-                str_links = "" unless str_links
-                str_links += ',' if str_links.length() > 0
+                str_associations = associationsSrc['str_associations']
+                str_associations = "" unless str_associations
+                str_associations += ',' if str_associations.length() > 0
                 
-                str_links += source['name'] + ',' + attrib
-                linkSrc['str_links'] = str_links
+                str_associations += source['name'] + ',' + attrib
+                associationsSrc['str_associations'] = str_associations
             end
           end
         end
@@ -232,7 +274,8 @@ module Rho
                     strCols += "\"#{col}\""
                 end
 
-                strIndex = "CREATE #{strUnique} INDEX \"rhoIndex_#{nInd}\" on #{src_name} (#{strCols});\r\n"
+                strIndName = "rhoIndex" + (is_unique ? "U" : "" ) + "_#{nInd}"
+                strIndex = "CREATE #{strUnique} INDEX \"#{strIndName}\" on #{src_name} (#{strCols});\r\n"
                 strRes += strIndex
                 nInd += 1
             end
@@ -246,7 +289,6 @@ module Rho
         puts 'init_schema_sources'
         
         uniq_sources.each do |source|
-          puts "source : #{source}"
           db = get_src_db(source['name'])
           
           if  source['schema'] && !db.table_exist?(source['name'])
@@ -309,18 +351,18 @@ module Rho
         uniq_sources.each do |source|
           puts "init_db_sources : #{source}"
           name = source['name']
-          priority = source['priority']
+          sync_priority = source['sync_priority']
           partition = source['partition']
           sync_type = source['sync_type']
           schema_version = source['schema_version']
-          links = source['str_links']
+          associations = source['str_associations']
           blob_attribs = process_blob_attribs(source, db)
           
-          attribs = db.select_from_table('sources','priority,source_id,partition, sync_type, schema_version, links, blob_attribs', 'name'=>name)
+          attribs = db.select_from_table('sources','sync_priority,source_id,partition, sync_type, schema_version, associations, blob_attribs', {'name'=>name})
 
           if attribs && attribs.size > 0 
-            if attribs[0]['priority'].to_i != priority.to_i
-                db.update_into_table('sources', {"priority"=>priority},{"name"=>name})
+            if attribs[0]['sync_priority'].to_i != sync_priority.to_i
+                db.update_into_table('sources', {"sync_priority"=>sync_priority},{"name"=>name})
             end
             if attribs[0]['sync_type'] != sync_type
                 db.update_into_table('sources', {"sync_type"=>sync_type},{"name"=>name})
@@ -331,8 +373,8 @@ module Rho
             if attribs[0]['partition'] != partition
                 db.update_into_table('sources', {"partition"=>partition},{"name"=>name})
             end
-            if attribs[0]['links'] != links
-                db.update_into_table('sources', {"links"=>links},{"name"=>name})
+            if attribs[0]['associations'] != associations
+                db.update_into_table('sources', {"associations"=>associations},{"name"=>name})
             end
             if attribs[0]['blob_attribs'] != blob_attribs
                 db.update_into_table('sources', {"blob_attribs"=>blob_attribs},{"name"=>name})
@@ -352,8 +394,8 @@ module Rho
             end
           
             db.insert_into_table('sources',
-                {"source_id"=>source['source_id'],"name"=>name, "priority"=>priority, "sync_type"=>sync_type, "partition"=>partition,
-                "schema_version"=>source['schema_version'], 'links'=>links, 'blob_attribs'=>blob_attribs })
+                {"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 })
                 
           end
           
@@ -490,10 +532,10 @@ module Rho
       err_page = nil
       if exception && exception.is_a?(::Rhom::RecordNotFound)
         err_page = RhoApplication::get_app_path(APPNAME) + 'E400_erb.iseq'
-        err_page = nil unless File.exist?(err_page)
+        err_page = nil unless ::Rho::file_exist?(err_page)
       elsif exception
         err_page = RhoApplication::get_app_path(APPNAME) + 'E500_erb.iseq'
-        err_page = nil unless File.exist?(err_page)
+        err_page = nil unless ::Rho::file_exist?(err_page)
       end
 
       if err_page
@@ -587,25 +629,23 @@ module Rho
       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]
         
-        @@sources[modelname] = new_source ? new_source : {}
+        @@sources[modelname] = new_source ? new_source.clone() : {}
         @@sources[modelname]['name'] ||= modelname
-        @@sources[modelname]['priority'] ||= 1000
-        @@sources[modelname]['partition'] ||= 'user'
-        @@sources[modelname]['sync_type'] ||= 'incremental'
+        @@sources[modelname]['sync_priority'] ||= 1000
+        if @@sources[modelname]['partition']
+            @@sources[modelname]['partition'] = @@sources[modelname]['partition'].to_s
+        else    
+            @@sources[modelname]['partition'] ||= 'user'
+        end    
         
-        if @@sources[modelname]['url'] && @@sources[modelname]['url'].length() == 0
-            @@sources[modelname]['sync'] = false
-        end
-
-        if @@sources[modelname]['sync'].nil?
-            @@sources[modelname]['sync'] = true
-        end
+        @@sources[modelname]['sync_type'] = 'none' if !@@sources[modelname]['sync']
+        @@sources[modelname]['sync_type'] ||= 'incremental'
         
-        @@max_config_srcid = new_source['source_id'] if new_source['source_id'] && @@max_config_srcid < new_source['source_id']
+        @@max_config_srcid = @@sources[modelname]['source_id'] if @@sources[modelname]['source_id'] && @@max_config_srcid < @@sources[modelname]['source_id']
       end
       
       @@g_base_temp_id = nil
@@ -626,6 +666,20 @@ module Rho
             ret ? 1 : 0
         end
 
+        def self.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})"
+          end
+
+          hdrs
+        end
+
 	def self.process_result(res, callback)
             return res if callback && callback.length() > 0
             
@@ -636,22 +690,22 @@ module Rho
         
         def self.get(args)
             process_result( 
-                AsyncHttp.do_get(args[:url], args[:headers],
+                AsyncHttp.do_get(args[:url], headers(args),
                     args[:callback], args[:callback_param], ssl_verify_peer(args) ), args[:callback] )
         end
         def self.post(args)
             process_result( 
-                AsyncHttp.do_post(args[:url], args[:headers], args[:body],
+                AsyncHttp.do_post(args[:url], headers(args), args[:body],
                     args[:callback], args[:callback_param], ssl_verify_peer(args) ), args[:callback] )
         end
         def self.download_file(args)
             process_result( 
-                AsyncHttp.do_downloadfile(args[:url], args[:headers], args[:filename],
+                AsyncHttp.do_downloadfile(args[:url], headers(args), args[:filename],
                     args[:callback], args[:callback_param], ssl_verify_peer(args) ), args[:callback] )
         end
         def self.upload_file(args)
             process_result( 
-                AsyncHttp.do_uploadfile(args[:url], args[:headers], args[:filename],
+                AsyncHttp.do_uploadfile(args[:url], headers(args), args[:body], args[:filename],
                     args[:callback], args[:callback_param], ssl_verify_peer(args) ), args[:callback] )
         end
     end

data/lib/framework/rho/rhoapplication.rb

@@ -69,6 +69,11 @@ module Rho
       def get_model_path(appname, modelname)
         Rho::RhoFSConnector::get_model_path(appname, modelname)
       end
+      
+      def get_blob_path(relative_file_path)
+        File.join(__rhoGetCurrentDir(), relative_file_path)
+      end
+      
     end
 
     def serve(req,res)
@@ -76,10 +81,10 @@ module Rho
       controller_class = req['model']+'Controller'
       undercase = controller_class.split(/(?=[A-Z])/).map{|w| w.downcase}.join("_")
 
-      if File.exists?  req[:modelpath]+ undercase +'.iseq'
-        require req[:modelpath]+ undercase
+      if Rho::file_exist?(  req[:modelpath]+ undercase +'.iseq' )
+        require req['model'] + '/' + undercase #req[:modelpath]+ undercase
       else
-        require req[:modelpath]+'controller'
+        require req['model'] + '/controller' #req[:modelpath]+'controller'
       end
       
       res['request-body'] = (Object.const_get(req['model']+'Controller').new).send :serve, self, @rhom, req, res

data/lib/framework/rho/rhocontroller.rb

@@ -56,7 +56,7 @@ module Rho
         res = send req['action'].nil? ? default_action : req['action']
       else
         called_action = @request['action'].nil? ? default_action : @request['action']
-        unless File.exist?(@request[:modelpath]+called_action.to_s+'_erb.iseq')
+        unless Rho::file_exist?(@request[:modelpath]+called_action.to_s+'_erb.iseq')
           rho_error( "Action '#{act}' does not exist in controller or has private access."  )
           res = render :string => "<font size=\"+4\"><h2>404 Not Found.</h2>The action <i>#{called_action}</i> does not have a view or a controller</font>"
         end

data/lib/framework/rhodes-framework.rb

@@ -1,2 +1,2 @@
-require 'version.rb'
+require 'version'
 $rhodeslib = File.dirname(__FILE__)

data/lib/framework/rhodes.rb

@@ -3,7 +3,7 @@ module Rhodes
     VERSION = '2.0.0'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '2.0.1'
+    DBVERSION = '2.0.2'
   end
   
 end

data/lib/framework/rhoframework.rb

@@ -1,28 +1,11 @@
 begin
 
-    #require 'net/http'
-    #puts 'NET REQUIRE'
-    #Net::HTTP.get_print 'www.gazeta.ru', '/index.html'
-
-    #puts 'NET FINISH'
-    
-    require 'rational'
-    #require 'date/format'
-    #require 'time'
-
-   # require 'sqlite3/constants'
-   # require 'sqlite3/errors'
-   # require 'sqlite3/pragmas'
+    if defined? RHO_ME
+	    require 'rationalME'
+    else	
+        require 'rational'
+    end
     
-   # require 'sqlite3/resultset'
-   # require 'sqlite3/statement'
-    
-   # require 'date'
-   # require 'sqlite3/translator'
-    
-   # require 'sqlite3/value'
-
-   # require 'sqlite3/database'
     require 'rhom/rhom_db_adapter'
 	
     require 'rhom/rhom_object'
@@ -35,6 +18,8 @@ begin
 
     require 'rho/rhoapplication'
 
+    require 'indifferent_access'
+    require 'rho/rhosupport'    
     require 'rho/rhocontroller'    
     require 'rho/render'
 

data/lib/framework/rhofsconnector.rb

@@ -1 +1 @@
-require 'rho/rhofsconnector.rb'
+require 'rho/rhofsconnector'

data/lib/framework/rholang/localization_simplified.rb

@@ -29,13 +29,13 @@ module LocalizationSimplified
       
       if check_exist
         begin
-            require file + curLocale if File.exist?(file + curLocale + '.iseq')
+            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 File.exist?(file + 'en.iseq')
+                    require file + 'en'  if Rho::file_exist?(file + 'en.iseq')
                 rescue Exception => e
                 end    
             end    

data/lib/framework/rhom/rhom.rb

@@ -22,6 +22,7 @@
 require 'rhom/rhom_object_factory'
 require 'rhom/rhom_object'
 require 'rhom/rhom_db_adapter'
+require 'rhom/rhom_model'
 
 module Rhom
   class RecordNotFound < StandardError

data/lib/framework/rhom/rhom_db_adapter.rb

@@ -148,10 +148,10 @@ class RhomDbAdapter
         if value.nil? or value == 'NULL'
           "NULL"
         elsif value.is_a?(String)
-          s = value.gsub("'","''")
+          s = value.gsub(/'/,"''")
           "'#{s}'"
         else
-          s = value.to_s.gsub("'","''")
+          s = value.to_s.gsub(/'/,"''")
           "'#{s}'"
         end
       end

data/lib/framework/rhom/rhom_model.rb

@@ -0,0 +1,98 @@
+
+module Rhom
+
+  module BaseModel
+    class << self
+      attr_accessor :model_params
+      
+    end
+
+    def get_model_params
+      BaseModel.model_params  
+    end
+
+    def reset_model_params    
+        BaseModel.model_params = {}
+    end
+    
+    def fixed_schema?
+        false
+    end
+    
+    def property(name,type=:string)
+  	  BaseModel.model_params ||= {}
+  	  
+  	  if type == :blob
+  	      BaseModel.model_params['blob_attribs'] ||= []
+  	      BaseModel.model_params['blob_attribs'] << name.to_s
+  	  end
+  	      
+  	  if fixed_schema?
+  	      BaseModel.model_params['schema'] ||= {}
+          BaseModel.model_params['schema']['columns'] ||= []  	  
+        
+  	      BaseModel.model_params['schema']['columns'] << name.to_s
+      	  #TODO: type support
+  	  end    
+  	  
+    end
+
+    def set(name,value)
+  	  BaseModel.model_params ||= {}
+  	  BaseModel.model_params[name.to_s] = value
+    end
+
+    def enable(name)
+      set(name,true)
+    end
+    
+    def belongs_to(name, owner)
+  	  BaseModel.model_params ||= {}
+  	  BaseModel.model_params['associations'] ||= {}
+  	  
+  	  BaseModel.model_params['associations'][owner.to_s] = name.to_s
+    end
+    
+    def index(*args)
+  	  return unless fixed_schema?
+  	  
+      BaseModel.model_params['schema'] ||= {}
+      BaseModel.model_params['schema']['indexes'] ||= []  	  
+
+      BaseModel.model_params['schema']['indexes'] << args
+    end
+
+    def unique_index(*args)
+  	  return unless fixed_schema?
+  	  
+      BaseModel.model_params['schema'] ||= {}
+      BaseModel.model_params['schema']['unique_indexes'] ||= []  	  
+
+      BaseModel.model_params['schema']['unique_indexes'] << args
+    end
+    
+  end
+  
+  module FixedSchema
+    include BaseModel
+
+    def self.included(model)
+      model.extend FixedSchema
+    end
+    
+    def fixed_schema?
+        true
+    end
+    
+  end
+
+  module PropertyBag
+    include BaseModel
+    
+    def self.included(model)
+      model.extend PropertyBag
+    end
+    
+  end
+  
+end # Rhom

data/lib/framework/rhom/rhom_object_factory.rb

@@ -18,23 +18,23 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-require 'rhom'
-require 'rho'
-require 'rho/rhosupport'
+#require 'rhom'
+#require 'rho'
+#require 'rho/rhosupport'
 
 module Rhom
   
   class RhomObjectFactory
     
     def initialize
-	    unless not defined? Rho::RhoConfig.sources
-  	    init_objects
-  	  end
+	  #unless not defined? Rho::RhoConfig.sources
+  	  #  init_objects
+  	  #end
     end
   
     # Initialize new object with dynamic attributes
-    def init_objects
-      Rho::RhoConfig.sources.each do |classname,source|
+    def self.init_object(classname)
+      #Rho::RhoConfig.sources.each do |classname,source|
         unless Object.const_defined?(classname.intern)
           Object.const_set(classname.intern, 
             Class.new do
@@ -1070,9 +1070,10 @@ module Rhom
               end
             end)
         end #unless
-        modelname = classname.split(/(?=[A-Z])/).map{|w| w.downcase}.join("_")
-        require "#{classname}/#{modelname}" if File.exists? File.join(Rho::RhoFSConnector.get_base_app_path,'app',classname,"#{modelname}.iseq")
-      end
-    end
+        #modelname = classname.split(/(?=[A-Z])/).map{|w| w.downcase}.join("_")
+        #puts "classname: #{classname}; modelname: #{modelname}"
+        #require "#{classname}/#{modelname}" if File.exists? File.join(Rho::RhoFSConnector.get_base_app_path,'app',classname,"#{modelname}.iseq")
+      #end
+    end #init_object
   end # RhomObjectFactory
 end # Rhom

data/lib/rhodes.rb

@@ -3,7 +3,7 @@ module Rhodes
     VERSION = '2.0.0'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '2.0.1'
+    DBVERSION = '2.0.2'
   end
   
 end

data/platform/android/Rhodes/jni/include/{JNIRhodes.h → rhodes/JNIRhodes.h}

@@ -4,11 +4,11 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <rhodes.h>
+
 #include <ruby.h>
 #include <ruby/ext/rho/rhoruby.h>
 
-#include <jni.h>
-
 #include <common/RhoDefs.h>
 #include <logging/RhoLogConf.h>
 #include <logging/RhoLog.h>
@@ -17,11 +17,10 @@
 
 JavaVM *jvm();
 void store_thr_jnienv(JNIEnv *env);
-JNIEnv *jnienv();
 
 enum rho_java_class_t {
 #define RHODES_DEFINE_JAVA_CLASS(x, name) x,
-#include <details/rhojava.inc>
+#include <rhodes/details/rhojava.inc>
 #undef RHODES_DEFINE_JAVA_CLASS
 };
 
@@ -36,56 +35,6 @@ jmethodID getJNIClassStaticMethod(JNIEnv *env, jclass cls, const char *name, con
 
 VALUE convertJavaMapToRubyHash(jobject objMap);
 
-namespace details
-{
-
-template <typename T, typename U>
-struct rho_cast_helper;
-
-template <>
-struct rho_cast_helper<std::string, jstring>
-{
-    std::string operator()(JNIEnv *env, jstring );
-};
-
-template <>
-struct rho_cast_helper<jstring, char const *>
-{
-    jstring operator()(JNIEnv *env, char const *);
-};
-
-template <>
-struct rho_cast_helper<jstring, char *>
-{
-    jstring operator()(JNIEnv *env, char *s) {return rho_cast_helper<jstring, char const *>()(env, s);}
-};
-
-template <int N>
-struct rho_cast_helper<jstring, char [N]>
-{
-    jstring operator()(JNIEnv *env, char (&s)[N]) {return rho_cast_helper<jstring, char const *>()(env, &s[0]);}
-};
-
-template <>
-struct rho_cast_helper<jstring, std::string>
-{
-    jstring operator()(JNIEnv *env, std::string const &s) {return rho_cast_helper<jstring, char const *>()(env, s.c_str());}
-};
-
-} // namespace details
-
-template <typename T, typename U>
-T rho_cast(JNIEnv *env, U u)
-{
-    return details::rho_cast_helper<T, U>()(env, u);
-}
-
-template <typename T, typename U>
-T rho_cast(U u)
-{
-    return details::rho_cast_helper<T, U>()(jnienv(), u);
-}
-
 #define RHO_NOT_IMPLEMENTED RAWLOG_ERROR3("WARNING: Call not implemented function: \"%s\" (defined here: %s:%d)", __PRETTY_FUNCTION__, __FILE__, __LINE__)
 
 //#define RHO_LOG_CALLBACK RAWLOG_INFO1("Callback \"%s\" called", __PRETTY_FUNCTION__)

data/platform/android/Rhodes/jni/include/{details → rhodes/details}/rhojava.inc

@@ -18,6 +18,7 @@ RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_MAP, "java/util/Map")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_MAPVIEW, "com/rhomobile/rhodes/mapview/MapView")
 #endif // RHO_GOOGLE_API_KEY
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_NATIVEBAR, "com/rhomobile/rhodes/NativeBar")
+RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_NAVBAR, "com/rhomobile/rhodes/NavBar")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_PHONEBOOK, "com/rhomobile/rhodes/phonebook/Phonebook")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_RHODES, "com/rhomobile/rhodes/Rhodes")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_RHOSOCKADDR, "com/rhomobile/rhodes/socket/RhoSockAddr")