rhodes 2.1.0 → 2.2.0.beta.1

data/lib/framework/rho/render.rb

@@ -22,10 +22,10 @@ module Rho
       @layout.nil? ? 'layout' : @layout
     end
 
-    def self.renderfile(filename)
+    def self.renderfile(filename, req = {}, res = {})
       res = ""
       if File.extname(filename) == '.iseq'
-        res = render_index(filename)
+        res = (RhoController.new).inst_render_index(filename, req, res)
       else
         res = IO.read(filename)
       end
@@ -34,21 +34,29 @@ module Rho
       res
     end
 
-    def inst_render_index(filename)
+    def inst_render_index(filename, req, res)
       rho_info 'inst_render_index'
-      @request, @response = {}
-      @params = {}
+      @request, @response = req, res
+      @params = RhoSupport::query_params req
+      
+      #@request, @response = {}
+      #@params = {}
       require 'rho/rhoviewhelpers'
-      layout = File.dirname(filename) + "/layout_erb.iseq"
+      
       @content = eval_compiled_file(filename, getBinding() )
-      @content = eval_compiled_file(layout, getBinding() ) if Rho::file_exist?(layout)
+      if !xhr?
+          rho_info 'index layout' 
+          layout = File.dirname(filename) + "/layout_erb.iseq"
+          @content = eval_compiled_file(layout, getBinding() ) if Rho::file_exist?(layout)
+	  else
+          if @request["headers"]["Transition-Enabled"] == "true"
+			  @content = "<div>#{@content}</div>"
+          end
+      end
+          
       @content
     end
 
-    def self.render_index(filename)
-      (RhoController.new).inst_render_index(filename)
-    end
-
     def getBinding
         binding
     end

data/lib/framework/rho/rho.rb

@@ -235,7 +235,10 @@ module Rho
           @db_partitions[partition] = nil unless @db_partitions[partition]
           
           if source['belongs_to']
-            source['belongs_to'].each do |attrib, src_name|    
+            source['belongs_to'].each do |hash_pair|    
+                attrib = hash_pair.keys[0]
+                src_name = hash_pair.values[0]
+                
                 associationsSrc = find_src_byname(uniq_sources, src_name)
                 if !associationsSrc
                     puts ( "Error: belongs_to '#{source['name']}' : source name '#{src_name}' does not exist."  )
@@ -330,7 +333,7 @@ module Rho
                 #TODO: support column type
             end
 
-            strCols += ",object varchar(255) PRIMARY KEY"
+            strCols += ",\"object\" varchar(255) PRIMARY KEY"
             strCreate = "CREATE TABLE #{source['name']} ( #{strCols} )"
           end
 
@@ -469,26 +472,26 @@ module Rho
       end 
     end
     
-    def serve_index(index_name)
+    def serve_index(index_name, req)
     	# TODO: Removed hardcoded appname
     	get_app(APPNAME).set_menu
       begin
         puts 'inside RHO.serve_index: ' + index_name
         res = init_response
-        res['request-body'] = RhoController::renderfile(index_name)
+        res['request-body'] = RhoController::renderfile(index_name, req, res)
         return send_response(res)
       rescue Exception => e
         return send_error(e)
       end
     end
 
-    def serve_index_hash(index_name)
+    def serve_index_hash(index_name, req)
     	# TODO: Removed hardcoded appname
     	get_app(APPNAME).set_menu
       begin
         puts 'inside RHO.serve_index: ' + index_name
         res = init_response
-        res['request-body'] = RhoController::renderfile(index_name)
+        res['request-body'] = RhoController::renderfile(index_name, req, res)
         return send_response_hash(res)
       rescue Exception => e
         return send_error(e, 500, true)
@@ -591,9 +594,7 @@ module Rho
           puts 'show error: ' + @@current_exception.inspect
           body = RhoController::renderfile(err_page)
           
-          if ( hash )
-            return send_response_hash(init_response(200,"OK",body))
-          end
+          return send_response_hash(init_response(200,"OK",body)) if hash
       
           return send_response(init_response(200,"OK",body))
       end
@@ -665,6 +666,10 @@ module Rho
       def send_log
         RhoConf.send_log
       end
+
+      def read_log(limit=0)
+        RhoConf.read_log(limit)
+      end
       
       def sources
         @@sources
@@ -721,7 +726,9 @@ module Rho
     module AsyncHttp
 
         def self.make_auth_header(args)
-          auth = args[:authentication]
+          auth = args[:authentication] if args.has_key?(:authentication)
+          auth = args [:authorization] if args.has_key?(:authorization)
+          
           return nil unless auth.is_a? Hash
           return nil if auth[:type].nil?
 

data/lib/framework/rho/rhobluetooth.rb

@@ -0,0 +1,103 @@
+
+module Rho
+ 
+class BluetoothManager
+ 
+  OK = 'OK'
+  CANCEL = 'CANCEL'
+  ERROR = 'ERROR'
+ 
+  ROLE_SERVER = 'ROLE_SERVER'
+  ROLE_CLIENT = 'ROLE_CLIENT'
+
+  def self.is_bluetooth_available
+    # return true/false
+    return RhoBluetooth.is_bluetooth_available()
+  end
+ 
+  def self.off_bluetooth
+    RhoBluetooth.off_bluetooth()
+  end
+ 
+  def self.set_device_name(name)
+    RhoBluetooth.set_device_name(name)
+  end
+ 
+  def self.get_device_name
+    return RhoBluetooth.get_device_name()
+  end
+ 
+  def self.get_last_error
+    #return OK/ERROR/...
+    return RhoBluetooth.get_last_error()
+  end
+ 
+  def self.create_session(role, callback_url)
+    # return OK/ERROR
+    #
+    # in callback
+    # status - OK/ERROR/CANCEL
+    # connected_device_name
+    puts 'BluetoothManager.rb::create_session()'
+    RhoBluetooth.create_session(role, callback_url)
+    return OK
+  end
+end
+ 
+ 
+class BluetoothSession
+ 
+  OK = 'OK'
+  CANCEL = 'CANCEL'
+  ERROR = 'ERROR'
+ 
+  SESSION_INPUT_DATA_RECEIVED = 'SESSION_INPUT_DATA_RECEIVED'
+  SESSION_DISCONNECT = 'SESSION_DISCONNECT'
+ 
+  def self.set_callback(connected_device_name, session_callback_url)
+    # return OK/ERROR
+    #
+    # in callback
+    # connected_device_name
+    # event_type - SESSION_INPUT_DATA_RECEIVED/ERROR/SESSION_DISCONNECT
+    puts 'BluetoothSession.rb::set_callback()'
+    RhoBluetooth.session_set_callback(connected_device_name, session_callback_url)
+    return OK
+  end  
+ 
+  def self.disconnect(connected_device_name)
+    # return OK/ERROR
+    RhoBluetooth.session_disconnect(connected_device_name)
+    return OK
+  end
+ 
+  def self.get_status(connected_device_name)
+    # return -1 if error, 0 if empty or 0< if data waiting for read 
+    return RhoBluetooth.session_get_status(connected_device_name)
+  end
+ 
+  def self.read(connected_device_name)
+    # return array of bytes
+    return RhoBluetooth.session_read_data(connected_device_name)
+  end
+ 
+  def self.write(connected_device_name, data)
+    # array of bytes
+    RhoBluetooth.session_write_data(connected_device_name, data)
+  end
+ 
+  def self.read_string(connected_device_name)
+    # return string
+    return RhoBluetooth.session_read_string(connected_device_name)
+  end
+ 
+  def self.write_string(connected_device_name, data)
+    # return OK/ERROR
+    RhoBluetooth.session_write_string(connected_device_name, data)
+    return OK
+  end
+ 
+end
+ 
+ 
+end

data/lib/framework/rho/rhocontroller.rb

@@ -77,6 +77,8 @@ module Rho
 
     # Returns true if the request's header contains "XMLHttpRequest".
     def xml_http_request?
+      return false if !@request || !@request['headers'] || !@request['headers']['X-Requested-With']
+       
       not /XMLHttpRequest/i.match(@request['headers']['X-Requested-With']).nil?
     end
     alias xhr? :xml_http_request?

data/lib/framework/rho/rhoevent.rb

@@ -0,0 +1,43 @@
+require 'bsearch'
+require 'time'
+
+if defined? RHO_ME
+  require 'rho/rhoevent_bb'
+else
+  require 'rho/rhoevent_c'
+end
+
+module Rho
+	module RhoEvent
+    # These values determined experimentally on iPhone
+    MIN_TIME = Time.utc(2007, 'jan', 1, 0, 0, 0)
+    MAX_TIME = Time.utc(2030, 'dec', 31, 23, 59, 59)
+    
+    #TODO: update examples    
+    # Examples of how to use select method:
+    #
+      # selected = Rho::RhoEvent.select('first_name' => 'David') { |x| x[1]['last_name']=='Taylor' }
+    # ==> returns record(s) of the David Taylor
+    #
+      # selected = Rho::RhoEvent.select('first_name' => 'Kate')
+    # ==> Returns all records of Kate
+    #
+      # selected = Rho::RhoEvent.select('last_name' => 'User') do |x|
+      # 	x[1]['first_name']=='Test' and x[1]['company_name']=="rhomobile"
+      # end
+    # ==> returns all records of the Test User from the company rhomobile
+    #
+    def self.select(index, &block)
+      key, value = index.keys[0], index.values[0]
+      if @events.nil? or @key != key
+        @key, @events = key, find(:all).to_a.sort! {|x,y| x[1][key] <=> y[1][key] }
+      end
+      found = @events[@events.bsearch_range {|x| x[1][key] <=> value}]
+      unless found.nil? or block.nil?
+        return found.select(&block)
+      end
+      return found
+    end
+
+	end # module RhoEvent
+end # module Rho

data/lib/framework/rho/rhoevent_bb.rb

@@ -0,0 +1,80 @@
+require 'bsearch'
+require 'time'
+
+module Rho
+	module RhoEvent
+    def self.find(*args)
+      pb = Calendar::openCalendar
+      if pb.nil?
+        puts "Can't open calendar"
+        return nil
+      elsif args.first == :all
+
+        if args.length > 1
+          records = Calendar::findCalendarEvents(pb, args[1])
+        else
+          records = Calendar::getallCalendarEvents(pb)
+        end
+
+        Calendar::closeCalendar(pb)
+        return records
+      else
+        record = Calendar::getCalendarEvent(pb,args.first)
+        Calendar::closeCalendar(pb)
+        return record
+      end
+    end
+
+    def self.create!(properties)
+      pb = Calendar::openCalendar
+      unless pb.nil?
+        record = Calendar::createEvent(pb)
+        if record.nil?
+          puts "Can't find event " + properties['id']
+        else
+          properties.each do |key,value|
+            if key == 'start_date' or key == 'end_date'
+              value = Time.parse(value) if value.is_a? String
+            end
+            if key == 'reminder' and value.is_a?(String) and value.empty?
+              next
+            end
+            Calendar::setEventValue(record,key,value)
+          end
+          Calendar::addEvent(pb,record)
+        end
+        Calendar::closeCalendar(pb)
+      end
+    end
+
+    def self.destroy(recordId)
+      pb = Calendar::openCalendar
+      unless pb.nil?
+        record = Calendar::openCalendarEvent(pb,recordId)
+        if record.nil?
+          puts "Can't find event " + recordId
+        else
+          Calendar::deleteEvent(pb,record)
+        end
+        Calendar::closeCalendar(pb)
+      end
+    end
+
+    def self.update_attributes(properties)
+      pb = Calendar::openCalendar
+      unless pb.nil?
+        record = Calendar::openCalendarEvent(pb,properties['id'])
+        if record.nil?
+          puts "Can't find event " + properties['id']
+        else
+          properties.each do |key,value|
+            Calendar::setEventValue(record,key,value)
+          end
+          Calendar::saveEvent(pb,record)
+        end
+        Calendar::closeCalendar(pb)
+      end
+    end
+
+	end # module RhoEvent
+end # module Rho

data/lib/framework/rho/rhoevent_c.rb

@@ -0,0 +1,47 @@
+require 'bsearch'
+require 'time'
+
+module Rho
+	module RhoEvent
+    def self.find(*args)
+      if args.first == :all
+        params = {}
+        params = args[1] if args.length >= 2 and args[1].is_a? Hash
+
+        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 )
+        
+        puts "Rho::Calendar.fetch(params) : #{params}"
+        events = Rho::Calendar.fetch(params)
+        #puts "events : #{events}"
+        #ret = {}
+        #events.each do |e|
+        #  ret[e[Rho::RhoEvent::ID]] = e
+        #end
+        #ret
+        events
+      else
+        id = args.first.to_s
+        id = $1 if id.is_a?(String) and id =~ /^{(.*)}$/
+        Rho::Calendar.fetch_by_id(id)
+      end
+    end
+
+    def self.create!(event)
+      Rho::Calendar.save(event)
+    end
+
+    def self.destroy(id)
+      id = $1 if id.is_a?(String) and id =~ /^{(.*)}$/
+      Rho::Calendar.delete(id)
+    end
+
+    def self.update_attributes(event)
+      puts "update_attributes: #{event}"
+      Rho::Calendar.save(event)
+    end
+
+	end # module RhoEvent
+end # module Rho

data/lib/framework/rhodes.rb

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

data/lib/framework/rhom/rhom_db_adapter.rb

@@ -107,6 +107,7 @@ class RhomDbAdapter
       #puts "RhomDbAdapter: Executing query - #{sql}; #{args}"
       begin
         result = @database.execute( sql, is_batch, args )
+        #puts "result : #{result}"
       rescue Exception => e
         puts "exception when running query: #{e}"
         raise
@@ -249,7 +250,7 @@ class RhomDbAdapter
             quests << ','
         end
     
-        cols << "#{key}"
+        cols << "\"#{key}\""
         quests << '?'
         vals << val
     end