rhodes 3.2.3 → 3.3.0.beta.1

data/lib/extensions/rhoxml/rexml/document.rb

@@ -3,10 +3,11 @@ require "rexml/element"
 require 'rexml/text'
 require "rexml/source"
 #require "rexml/doctype"
-=begin
-require "rexml/comment"
+
+#require "rexml/comment"
 
 require "rexml/instruction"
+=begin
 require "rexml/rexml"
 require "rexml/parseexception"
 require "rexml/output"

data/lib/extensions/rhoxml/rexml/instruction.rb

@@ -0,0 +1,70 @@
+require "rexml/child"
+require "rexml/source"
+
+module REXML
+  # Represents an XML Instruction; IE, <? ... ?>
+  # TODO: Add parent arg (3rd arg) to constructor
+  class Instruction < Child
+    START = '<\?'
+    STOP = '\?>'
+
+    # target is the "name" of the Instruction; IE, the "tag" in <?tag ...?>
+    # content is everything else.
+    attr_accessor :target, :content
+
+    # Constructs a new Instruction
+    # @param target can be one of a number of things.  If String, then 
+    # the target of this instruction is set to this.  If an Instruction,
+    # then the Instruction is shallowly cloned (target and content are
+    # copied).  If a Source, then the source is scanned and parsed for
+    # an Instruction declaration.
+    # @param content Must be either a String, or a Parent.  Can only
+    # be a Parent if the target argument is a Source.  Otherwise, this
+    # String is set as the content of this instruction.
+    def initialize(target, content=nil)
+      if target.kind_of? String
+        super()
+        @target = target
+        @content = content
+      elsif target.kind_of? Instruction
+        super(content)
+        @target = target.target
+        @content = target.content
+      end
+      @content.strip! if @content
+    end
+
+    def clone
+      Instruction.new self
+    end
+    
+    # == DEPRECATED
+    # See the rexml/formatters package
+    #
+    def write writer, indent=-1, transitive=false, ie_hack=false
+      Kernel.warn( "#{self.class.name}.write is deprecated" )
+      indent(writer, indent)
+      writer << START.sub(/\\/u, '')
+      writer << @target
+      writer << ' '
+      writer << @content
+      writer << STOP.sub(/\\/u, '')
+    end
+
+    # @return true if other is an Instruction, and the content and target
+    # of the other matches the target and content of this object.
+    def ==( other )
+      other.kind_of?( Instruction ) and
+      other.target == @target and
+      other.content == @content
+    end
+
+    def node_type
+      :processing_instruction
+    end
+
+    def inspect
+      "<?p-i #{target} ...?>"
+    end
+  end
+end

data/lib/framework/builtinME.rb

@@ -823,3 +823,12 @@ class String
     end
     	
 end
+
+class Encoding
+
+US_ASCII = "US-ASCII"
+UTF_8 = "UTF-8";
+ASCII_8BIT = "ASCII-8BIT"
+ISO_8859_1 = "ISO-8859-1"
+
+end

data/lib/framework/date/format.rb

@@ -538,7 +538,7 @@ class Date
 				 else /\A([-+]?\d{1,})/
 				 end, '')
 	  val = $1.to_i
-	  puts "val: #{val}"
+	  #puts "val: #{val}"
 	  e.year = val
 	when 'y', 'Ey', 'Oy'
 	  return unless str.sub!(/\A(\d{1,2})/, '')

data/lib/framework/dateME.rb

@@ -72,6 +72,13 @@ class Time
     elsif fmt == '%Y%m%d'
         strRes = year().to_s() +  __makeTwoDigit(mon()) + __makeTwoDigit(mday())
 		return strRes 
+    elsif fmt == '%m/%d/%Y'
+        strRes = __makeTwoDigit(mon()) + "/" + __makeTwoDigit(mday()) + "/" + year().to_s()
+		return strRes 
+    elsif fmt == '%I:%M%p'
+        strPM, nHour = __getPM()
+        strRes += __makeTwoDigit(nHour) + ':' + __makeTwoDigit(min()) + strPM;
+		return strRes 
     elsif fmt == '%a'
 		strRes = LocalizationSimplified::DateHelper::AbbrDaynames[wday()]
 		return strRes 
@@ -129,11 +136,20 @@ class Date
   end
   
   def - (x)
-    ((@m_date-x._get_date()).to_i)/(60*60*24)
+    case x
+    when Numeric; return Date.new( @m_date - x*(60*60*24) )
+    when Date;    return ((@m_date-x._get_date()).to_i)/(60*60*24)
+    end
+    raise TypeError, 'expected numeric or date'
+    
   end
 
   def + (x)
-    Date.new( @m_date + x*(60*60*24) )
+    case x
+    when Numeric; return Date.new( @m_date + x*(60*60*24) )
+    end
+    raise TypeError, 'expected numeric'
+    
   end
 
   # Get the week day of this date.  Sunday is day-of-week 0;
@@ -156,6 +172,7 @@ class Date
   def mon() @m_date.mon end
   def year() @m_date.year end
   def mday() @m_date.mday end
+  def day() @m_date.day end  
   def offset() 
     of = Rational(@m_date.gmt_offset() || 0, 86400)
   end

data/lib/framework/rho/rho.rb

@@ -467,7 +467,7 @@ end
                         
                         ::Rho::RHO.init_sync_source_properties(uniq_sources)
                         
-                        SyncEngine.update_blob_attribs(partition, Rho::RhoConfig::sources[modelName]['source_id'].to_i() )
+                        #SyncEngine.update_blob_attribs(partition, Rho::RhoConfig::sources[modelName]['source_id'].to_i() )
                         db.commit
                     rescue Exception => e
                         trace_msg = e.backtrace.join("\n")
@@ -541,7 +541,7 @@ end
             db.start_transaction
             begin
                 init_db_sources(db, uniq_sources, partition,hash_migrate)
-                SyncEngine.update_blob_attribs(partition, -1 )
+                #SyncEngine.update_blob_attribs(partition, -1 )
                 
                 db.commit
             rescue Exception => e
@@ -558,6 +558,10 @@ end
         ::Rho::RHO.init_schema_sources(hash_migrate)
         ::Rho::RHO.check_sources_migration(uniq_sources)
         
+        #@db_partitions.each do |partition, db|
+        #    SyncEngine.update_blob_attribs(partition, -1 )
+        #end
+        
         ::Rho::RHO.init_sync_source_properties(uniq_sources)
     end
 
@@ -651,6 +655,8 @@ end
           end
         
         end
+        
+        SyncEngine.update_blob_attribs(partition, -1 )
     end
 
     def self.make_createsql_script(name,schema_attr)
@@ -761,6 +767,7 @@ end
           schema_version = source['schema_version']
           associations = source['str_associations']
           blob_attribs = process_blob_attribs(source, db)
+          #puts "blob_attribs : #{blob_attribs}"
           
           #attribs = db.select_from_table('sources','sync_priority,source_id,partition, sync_type, schema_version, associations, blob_attribs', {'name'=>name})
           attribs = find_src_byname(db_sources,name)
@@ -957,7 +964,7 @@ end
     def send_error(exception=nil,status=500,hash=false)
       if exception
         trace_msg = exception.backtrace.join("\n")
-	    puts "App error: #{exception}\n #{trace_msg}"
+	    puts "App error: #{exception.message}\n #{trace_msg}"
 	  end  
       body=''
       
@@ -1019,7 +1026,7 @@ end
       def method_missing(name, *args)
         unless name == Fixnum
           if name[name.length()-1] == '='
-            RhoConf.set_property_by_name(name.to_s.chop,args[0]) 
+            RhoConf.set_property_by_name(name.to_s.chop,args[0] ? args[0].to_s : "") 
           else
             RhoConf.get_property_by_name(name.to_s)             
           end
@@ -1292,4 +1299,8 @@ module Kernel
     def require_source(name)
         Rho::RHO.get_instance().load_model(name.to_s)        
     end
+    def require_model(name)
+        Rho::RHO.get_instance().load_model(name.to_s)        
+    end
+    
 end    

data/lib/framework/rho/rhoapplication.rb

@@ -138,6 +138,7 @@ module Rho
 
     def on_sync_user_changed
         Rhom::Rhom.database_full_reset(false, false)    
+        ::Rho::RHO.get_user_db().execute_sql("UPDATE client_info SET client_id=?", "")
     end
     
     def on_reinstall_config_update(conflicts)

data/lib/framework/rho/rhocontact.rb

@@ -44,34 +44,17 @@ module Rho
                     puts "Can't open phonebook"
                 elsif args.first.nil? or args.length == 0
                     puts "There are no arguments to find contacts"
-                elsif args.first == :all or args.first == :first or args.first == :count
-                    #conditions = args[1][:conditions] if args[1] && args[1][:conditions] && args[1][:conditions].is_a?(Hash)
-
-                    limit = -1
-                    offset = 0
-                    select = []
-
-                    if args[1]
-                        #if args[1][:conditions]
-                        #    condition_str = convertSqlConditionToStr(args[1][:conditions], args[1][:op])
-                    
-                        if args[1][:per_page] #and args[1][:offset]
-                            limit = args[1][:per_page].to_i
-                            offset = args[1][:offset] ? args[1][:offset].to_i : 0
-                        end
-
-                        select = args[1][:select] if args[1][:select]
+                elsif args.first == :all or args.first == :first
+                    if System::get_property('platform') == "ANDROID" or System::get_property('platform') == "APPLE"
+                        result = Phonebook::getRecords(pb, args[1])
+                    else
+                        result = Phonebook::allRecords(pb)
                     end
-                    limit = 1 if args.first == :first
-
-                    if args.first == :all or args.first == :first
-                        if System::get_property('platform') == "ANDROID"
-                            result = Phonebook::getRecords(pb, offset, limit, select)
-                        else
-                            result = Phonebook::allRecords(pb)
-                        end
-				    elsif args.first == :count
-                        result = Phonebook::countRecords(pb, offset, limit)
+		        elsif args.first == :count
+                    if System::get_property('platform') == "ANDROID" or System::get_property('platform') == "APPLE"
+                        result = Phonebook::countRecords(pb, args[1])
+                    else
+                        result = Phonebook::countRecords(pb);
                     end
                 else
                     result = Phonebook::getRecord(pb, args.first)

data/lib/framework/rho/rhoevent_c.rb

@@ -33,18 +33,23 @@ module Rho
       if args.first == :all
         params = {}
         if args.length >= 2 and args[1].is_a? Hash
+          puts "Event find params: #{args[1].inspect}"
           args[1].each do |k,v|
             params[k.to_s] = v
+            puts "#{k.to_s} => #{v}"
           end
         end
 
         params['start_date'] = params['start_date'].to_time if !params['start_date'].nil? and !params['start_date'].is_a?(Time)
-        params['end_date'] = params['end_date'].to_time if !params['end_date'].nil? and !params['start_date'].is_a?(Time)
+        params['end_date'] = params['end_date'].to_time if !params['end_date'].nil? and !params['end_date'].is_a?(Time)
         
         params['start_date'] = MIN_TIME if params['start_date'].nil? or params['start_date'] < MIN_TIME
         params['end_date'] = MAX_TIME if params['end_date'].nil? or params['end_date'] > MAX_TIME
         
-        params['include_repeating'] = false if ( params['start_date'] == MIN_TIME || params['end_date'] == MAX_TIME )
+        if params['start_date'] == MIN_TIME or params['end_date'] == MAX_TIME
+          params['include_repeating'] = false
+          puts "Resetting 'include_repeating' param to false"
+        end
         
         puts "Rho::Calendar.fetch(params) : #{params}"
         events = Rho::Calendar.fetch(params)
@@ -65,6 +70,7 @@ module Rho
     def self.create!(event)
       event['id'] = nil #indicate that event should be created
       event['reminder'] = event['reminder'].to_i if event['reminder'] != nil
+      event['recurrence']['end'] = nil if event['recurrence'] and event['recurrence']['end'] == ""
       new_id = Rho::Calendar.save(event)
       event['id'] = new_id
       return event

data/lib/framework/rho/rhosupport.rb

@@ -226,5 +226,30 @@ module Rho
         raise TypeError, "Conflicting types for parameter containers. Expected an instance of #{klass} but found an instance of #{value.class}. This can be caused by colliding Array and Hash parameters like qs[]=value&qs[key]=value. (The parameters received were #{value.inspect}.)"
       end
     end
+    
+    def self.rhobundle_getfilename()
+        File.join( __rhoGetCurrentDir(), '/RhoBundle/upgrade_bundle.zip')
+    end
+    
+    def self.rhobundle_download(download_url, download_callback)
+
+        file_name = rhobundle_getfilename()
+        dir_name = File.dirname(file_name)
+        if Dir.exists?(dir_name) && System.delete_folder(dir_name) != 0
+            return false
+        end
+        
+        Dir.mkdir(dir_name) unless Dir.exists?(dir_name)
+        
+        Rho::AsyncHttp.download_file(
+                 :url => download_url,
+                 :filename => file_name,
+                 :headers => {},
+                 :callback => download_callback ) if download_url
+                 
+        return true
+    end
+    
+    
   end # RhoSupport
 end # Rho

data/lib/framework/rhodes.rb

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

data/lib/framework/rhoframework.rb

@@ -89,6 +89,13 @@ module Kernel
 		 orig_require( file_name )
 	end
 
+	alias :orig_load :load
+
+	def load(file_name)
+		 file_name += '.rb' unless file_name.end_with?('.rb')
+		 orig_load( file_name )
+	end
+
 	def eval_compiled_file(fname, bind)
 	    code = IO.read(fname)
 	    code.force_encoding('utf-8')
@@ -120,6 +127,13 @@ class Thread
   end
 end
 
+module SignatureTool
+    def SignatureTool.take_signature( callback, image_fmt)
+        
+        Rho::SignatureCapture.take(callback, :imageFormat => image_fmt)
+    end
+end
+
 begin
 	if defined? RHO_WP7
 		require 'rhosystem'
@@ -162,3 +176,4 @@ rescue Exception => e
     trace_msg = e.backtrace.join("\n")
     puts 'Create RHO framework failed: ' + e.inspect + ";Trace: #{trace_msg}"
 end    
+

data/lib/framework/rholang/localization_simplified.rb

@@ -26,6 +26,8 @@ module LocalizationSimplified
   def self.set_cur_locale(loc, country)
     @@cur_locale = loc
     @@cur_country = country  
+    
+    puts "Current locale: #{@@cur_locale}; Country code: #{@@cur_country}"
   end
   
     def self.init_current_locale
@@ -36,9 +38,6 @@ module LocalizationSimplified
         @@cur_locale = 'en' unless @@cur_locale
         @@cur_country = System::get_property("country")
         @@cur_country = @@cur_country.downcase if @@cur_country
-        
-        puts "Current locale: #{@@cur_locale}; Country code: #{@@cur_country}"
-                
     end
     
     def self.requre_loc(file,check_exist)
@@ -50,20 +49,19 @@ if defined?( RHODES_EMULATOR )
 else
             file = File.join( __rhoGetCurrentDir(), 'lib', file)            
 end            
-            puts "file: #{file}"
         end
-      
-      puts "Current locale: #{@@cur_locale}; Country code: #{@@cur_country}"
+
+      puts "Locilized file: #{file}"
       
         if @@cur_country && @@cur_country.length() > 0 && Rho::file_exist?(file + @@cur_locale + '_' + @@cur_country + RHO_RB_EXT) 
-            require file + @@cur_locale + '_' + @@cur_country
+            load file + @@cur_locale + '_' + @@cur_country
         elsif Rho::file_exist?(file + @@cur_locale + RHO_RB_EXT)
-            require file + @@cur_locale
+            load file + @@cur_locale
         else    
             puts 'Could not find resources for locale: ' + @@cur_locale.to_s + ";file: #{file}" if @@cur_locale != 'en'
             if @@cur_locale != 'en' && Rho::file_exist?(file + 'en' + RHO_RB_EXT)
                 puts 'Load english resources.'
-                require file + 'en'
+                load file + 'en'
             end    
         end
     end
@@ -75,7 +73,7 @@ end
 module System
     def self.set_locale(locale_code, country_code = nil)
         LocalizationSimplified::set_cur_locale(locale_code, country_code)
-        
+
         LocalizationSimplified.requre_loc('rholang/lang_',false)
         LocalizationSimplified.requre_loc(Rho::RhoFSConnector::get_app_path('app') + 'lang/lang_',true)
         LocalizationSimplified.requre_loc('rholang/rhoerror_',false)

data/lib/framework/rhom/rhom_object_factory.rb

@@ -116,6 +116,12 @@ module Rhom
                   
                   Rho::RhoController.cached_metadata[src_name]
                 end
+                
+                def metadata=(metadata_doc)
+                  src_name = get_source_name
+                  db = ::Rho::RHO.get_src_db(src_name)
+                  db.execute_sql("UPDATE sources set metadata=? where name=?", metadata_doc, src_name)
+                end
 
                 def count
                   db = ::Rho::RHO.get_src_db(get_source_name)
@@ -171,7 +177,7 @@ module Rhom
 
                 def convertOpToStr(val_op, value)
                     res = ""
-                    if val_op.upcase == 'IN'
+                    if val_op.upcase == 'IN' || val_op.upcase == 'NOT IN'
                     
                         if value.is_a?(String)
                             value = value.split(",")
@@ -400,7 +406,7 @@ module Rhom
                         end
                     end
                     
-                    if val_op == 'IN' or val_op == 'in'
+                    if val_op.upcase == 'IN' || val_op.upcase == 'NOT IN'
 
                         if value.is_a?(String)
                             value = value.split(",")