rhodes-framework 1.1.1 → 1.2.0

data/lib/rhom/rhom_object.rb

@@ -18,33 +18,7 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 module Rhom
-  module RhomObject
-    # defines a method at runtime for the
-    # dynamically created class
-    
-    
-    # we override method_missing here so that instance variables,
-    # when retrieved or set, are added to the object
-    def method_missing(name, *args)
-      unless name == Fixnum
-        varname = name.to_s.gsub(/=/,"")
-        setting = (name.to_s =~ /=/)
-        inst_var = nil
-
-        if setting
-          inst_var = instance_variable_set( "@#{varname}", args[0] )  
-        else
-          inst_var = instance_variable_get( "@#{varname}" )
-        end
-        
-        inst_var
-      end
-    end
-    
-    def remove_var(name)
-      remove_instance_variable("@#{name}")
-    end
-  
+  module RhomObject    
     def strip_braces(str=nil)
       str ? str.gsub(/\{/,"").gsub(/\}/,"") : nil
     end
@@ -59,7 +33,7 @@ module Rhom
     end
     
     def extract_options(arr=[])
-      arr.last.is_a?(::Hash) ? arr.pop : {}
+      arr.last.is_a?(Hash) ? arr.pop : {}
     end
     
     @@reserved_names = {"object" => "1",
@@ -73,9 +47,6 @@ module Rhom
 
     def method_name_reserved?(method)
       @@reserved_names.has_key?(method)
-    end    
-    #def method_name_reserved?(method)
-     # method =~ /\bobject\b|\bsource_id\b|\bupdate_type\b|\battrib_type\b|\btype\b|\bset_notification\b|\bclear_notification\b/
-    #end
+    end
   end # RhomObject
 end # Rhom

data/lib/rhom/rhom_object_factory.rb

@@ -26,148 +26,156 @@ module Rhom
   class RhomObjectFactory
     
     def initialize
-	    unless not defined? Rho::RhoConfig::sources
+	    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|
-        unless Object::const_defined?(classname.intern)
-          Object::const_set(classname.intern, 
-            Class::new do
+      Rho::RhoConfig.sources.each do |classname,source|
+        unless Object.const_defined?(classname.intern)
+          Object.const_set(classname.intern, 
+            Class.new do
               include ::Rhom::RhomObject
               extend ::Rhom::RhomObject
+              
+              # This holds the attributes for an instance of
+              # the rhom object
+              attr_accessor :vars
           
               def initialize(obj=nil)
-                self.send("object=".to_sym(), "#{((Time.now.to_f - Time.mktime(2009,"jan",1,0,0,0,0).to_f) * 10**6).to_i}")
+                @vars = {}
+                self.vars['object'] = "#{((Time.now.to_f - Time.mktime(2009,"jan",1,0,0,0,0).to_f) * 10**6).to_i}"
                 if obj
-                  self.send("source_id=".to_sym(), obj['source_id'].to_s)
-                  self.send("update_type=".to_sym(), 'create')
                   obj.each do |key,value|
-					          val =  self.inst_strip_braces(value)
-                    self.send("#{key}=".to_sym(), val)
+                    self.vars[key] = value
+                  end
+                end
+              end
+              
+              def method_missing(name, *args)
+                unless name == Fixnum
+                  varname = name.to_s.gsub(/\=/,"")
+                  setting = (name.to_s =~ /=/)
+                  if setting
+                    @vars[varname] = args[0]  
+                  else
+                    @vars[varname]
                   end
                 end
-            
               end
 		  
               class << self
               
                 def count
-                  ::Rhom::RhomDbAdapter::select_from_table(::Rhom::TABLE_NAME,
-                                                           'object',
-                                                           {"source_id"=>get_source_id},
-                                                           {"distinct"=>true}).length
+                  SyncEngine.lock_sync_mutex
+                  res = ::Rhom::RhomDbAdapter.select_from_table('object_values','object', {"source_id"=>get_source_id}, {"distinct"=>true}).length
+                  SyncEngine.unlock_sync_mutex
+                  res
                 end
               
                 def get_source_id
-                  Rho::RhoConfig::sources[self.name.to_s]['source_id'].to_s
+                  Rho::RhoConfig.sources[self.name.to_s]['source_id'].to_s
                 end
                 
                 # retrieve a single record if object id provided, otherwise return
                 # full list corresponding to factory's source id
                 def find(*args)
-                  list = []
-                  hash_list = {}
+                  raise ::Rhom::RecordNotFound if args[0].nil? or args.length == 0
+                  puts "Inside find: args - #{args.inspect}"
+                  ret_list = []
                   conditions = {}
-
+                  where_cond = nil
                   # first find all query objects
                   if args.first == :all
-                    conditions = {"source_id"=>get_source_id}
+                    where_cond = {"source_id"=>get_source_id}
                   elsif args.first.is_a?(String)
-                    conditions = {"object"=>strip_braces(args.first.to_s)}
+                    where_cond = {"object"=>strip_braces(args.first.to_s)}
                   end
-                  
+
                   # do we have conditions?
                   # if so, add them to the query
-                  condition_hash = {}
+                  condition_hash = nil
                   select_arr = nil
+                  condition_str = nil
+                  limit = nil
+                  offset = nil
                   if args[1]
-                    condition_hash = get_conditions_hash(args[1][:conditions]) if args[1] and args[1][:conditions] and args[1][:conditions].is_a?(Hash)
-                    conditions.merge!(condition_hash)
-                    
-                    select_arr = args[1][:select] if args[1][:select]
-                  end
-
-                  # process query, create, and update lists in order
-                  sql_attrs = 'object,attrib,value'
-                  ["query", "create", "update"].each do |update_type|
-                    conditions.merge!({"update_type"=>update_type})
-                    objs = ::Rhom::RhomDbAdapter::select_from_table(::Rhom::TABLE_NAME, sql_attrs, conditions, {"order by"=>'object'},select_arr)
-
-                    # fetch the rest of the attributes if we're searching by specific attrib value
-                    #if conditions and conditions.size > 0
-                    if args[1] and args[1][:conditions] and args[1][:conditions].is_a?(Hash)
-                      full_objects = []
-                      objs.each do |obj|
-                        if not select_arr
-                          full_objects += ::Rhom::RhomDbAdapter::select_from_table(::Rhom::TABLE_NAME, sql_attrs, {'object' => obj['object'].to_s})
-                        elsif select_arr and conditions
-                          full_objects += ::Rhom::RhomDbAdapter::select_from_table(::Rhom::TABLE_NAME, sql_attrs, {'object' => obj['object'].to_s}, nil, select_arr)
-                        end
+                    if args[1][:conditions]
+                      condition_hash = args[1][:conditions] if args[1][:conditions].is_a?(Hash)
+                      # conditions are a string
+                      condition_str = args[1][:conditions] if args[1][:conditions].is_a?(String)
+                      # conditions are an array
+                      if args[1][:conditions].is_a? (Array)
+                        condition_str = args[1][:conditions][0].split(/\?/).each_with_index { |param,i| 
+                          param << args[1][:conditions][i+1].to_s
+                        }.join(' ').to_s 
                       end
-                      objs = full_objects
                     end
-
-                    # build up the object array where each
-                    # row in this array is a rhom_object
-                    #index = -1
-                    #hash_objects = {}
-                    
-                    objs.each do |obj|
-                      object = obj['object']
-                      attrib = obj['attrib']
-                      value = obj['value']
-                      
-                      #if not hash_objects[object]
-                      #  list.push get_new_obj(obj)
-                      #  index += 1
-                      #  hash_objects[object] = index
-                      #elsif
-                      #  index = hash_objects[object]
-                      #end
-                      #isReserved = method_name_reserved?(attrib)
-                      #This is required because update should override query
-                      #if not isReserved and list[index].send(attrib.to_sym)
-                      #  list[index].remove_var(attrib)
-                      #end
-                      #list[index].send("#{attrib}=".to_sym(), value) if not isReserved
-                      
-                      isReserved = method_name_reserved?(attrib)
-                      hash_list[object] = get_new_obj(obj) if not hash_list[object]
-                      if not isReserved and hash_list[object].send(attrib.to_sym)
-                        hash_list[object].remove_var(attrib)
-                      end
-                      hash_list[object].send("#{attrib}=".to_sym(), value) if not isReserved
-                      #nil # remove the element from the array
+                    if args[1][:per_page] and args[1][:offset]
+                      limit = args[1][:per_page].to_s
+                      offset = args[1][:offset].to_s
                     end
-                    
+                    select_arr = args[1][:select] if args[1][:select]
                   end
-                  #hash_objects = nil
-                  
-                  # convert hash to array
-                  list = hash_list.values
-                  hash_list = nil
                   
-                  # setup order by if provided
-                  order = extract_options(args)
-                  order_value = order[:order] if order and order[:order]
-                  if order_value
-                    order_sym = order_value.to_sym
-                    list.sort! {|x,y| x.send(order_sym) && y.send(order_sym) ? x.send(order_sym) <=> y.send(order_sym) : 0}
-                  end
+				          start = Time.new
+                  # return horizontal resultset from database
+                  # for example, an object that has attributes name,industry:
+                  # |               object                 |       name         |  industry   |
+                  # ---------------------------------------------------------------------------
+                  # | 3560c0a0-ef58-2f40-68a5-48f39f63741b |A.G. Parr PLC 37862 |Entertainment|
+                  attribs = get_attribs
+                  if attribs and attribs.length > 0
+                    sql = ""
+                    sql << "SELECT * FROM (\n" if condition_hash or condition_str
+                    sql << "SELECT object,\n"
+                    attribs.reject! {|attrib| select_arr.index(attrib).nil?} if select_arr
+                    start = Time.new
+                    attribs.each do |attrib|
+                      unless attrib.nil? or attrib.length == 0 or method_name_reserved?(attrib)
+                        sql << "MAX(CASE WHEN attrib = '#{attrib}' AND update_type IN (#{::Rhom::UPDATE_TYPES.join(',')}) THEN value ELSE NULL END) AS \"#{attrib}\",\n"
+                      end
+                    end 
+                    sql.chomp!
+                    sql.chop!
+                    sql << " FROM object_values ov where update_type not in ('delete','update')\n"
+                    sql << "AND " + ::Rhom::RhomDbAdapter.where_str(where_cond) + "\n" if where_cond and where_cond.length > 0
+                    sql << "group by object\n"
+                    sql << "order by \"#{args[1][:order]}\"" if args[1] and args[1][:order]
+                    sql << ") WHERE " + ::Rhom::RhomDbAdapter.where_str(condition_hash) if condition_hash
+                    sql << ") WHERE " + condition_str if condition_str
+                    sql << " LIMIT " + limit + " OFFSET " + offset if limit and offset
                   
-                  # return a single rhom object if searching for one
-                  if args.first == :first or args.first.is_a?(String)
-                    return list[0]
+                    list = ::Rhom::RhomDbAdapter.execute_sql(sql)
+                    puts "Database query took #{Time.new - start} sec, #{list.length} rows"
+                    start = Time.new
+                    list.each do |rowhash|
+                      # always return object field with surrounding '{}'
+                      rowhash['object'] = "{#{rowhash['object']}}"
+                      new_obj = self.new
+                      new_obj.vars.merge!(rowhash)
+                      ret_list << new_obj
+                    end
                   end
-                  list
+                  puts "Processing rhom objects took #{Time.new - start} sec, #{ret_list.length} objects"
+                  args.first == :first || args.first.is_a?(String) ? ret_list[0] : ret_list
                 end
               
-                def find_all(args={})
-                  find(args)
+                # Alias for find
+                def find_all(args=nil)
+                  find(:all, args)
+                end
+                
+                # Returns a set of rhom objects, limiting the set to length :per_page
+                # If no :per_page is specified, the default size is 10
+                def paginate(args=nil)
+                  # Default to 10 items per page
+                  args[:page] ||= 0
+                  args[:per_page] ||= 10
+                  args[:offset] = args[:page] * args[:per_page]
+                  find(:all, args)
                 end
   
                 def set_notification(url,params)
@@ -179,19 +187,12 @@ module Rhom
                 end
                 
                 def ask(question)
-                  tmp_obj = get_new_obj(:object =>djb_hash("#{question}#{rand.to_s}", 10).to_s)
+                  tmp_obj = self.new(:object =>djb_hash("#{question}#{rand.to_s}", 10).to_s)
                   if question
                     # We only support one ask at a time!
-                    ::Rhom::RhomDbAdapter::delete_from_table(::Rhom::TABLE_NAME,
-                                                              {"source_id"=>get_source_id,
-                                                               "update_type"=>'ask'})
-                    ::Rhom::RhomDbAdapter::insert_into_table(::Rhom::TABLE_NAME,
-                                                              {"source_id"=>get_source_id,
-                                                               "object"=>tmp_obj.object,
-                                                               "attrib"=>'question',
-                                                               "value"=>Rho::RhoSupport.url_encode(question),
-                                                               "update_type"=>'ask'})
-                    SyncEngine::dosync
+                    ::Rhom::RhomDbAdapter.delete_from_table('object_values', {"source_id"=>get_source_id, "update_type"=>'ask'})
+                    ::Rhom::RhomDbAdapter.insert_into_table('object_values', {"source_id"=>get_source_id, "object"=>tmp_obj.object, "attrib"=>'question', "value"=>Rho::RhoSupport.url_encode(question), "update_type"=>'ask'})
+                    SyncEngine.dosync
                   end
                 end
                 
@@ -200,24 +201,24 @@ module Rhom
                   if conditions
                     del_conditions = get_conditions_hash(conditions[:conditions])
                     # find all relevant objects, then delete them
-                    del_objects = ::Rhom::RhomDbAdapter::select_from_table(::Rhom::TABLE_NAME,
-                                                                           'object',
-                                                                           del_conditions.merge!({"source_id"=>get_source_id}),
-                                                                           {"distinct"=>true})
+                    del_objects = ::Rhom::RhomDbAdapter.select_from_table('object_values', 'object', del_conditions.merge!({"source_id"=>get_source_id}), {"distinct"=>true})
                     del_objects.each do |obj|                                                       
-                      ::Rhom::RhomDbAdapter::delete_from_table(::Rhom::TABLE_NAME, {'object'=>obj['object']})
+                      ::Rhom::RhomDbAdapter.delete_from_table('object_values', {'object'=>obj['object']})
                     end
                   else
-                    ::Rhom::RhomDbAdapter::delete_from_table(::Rhom::TABLE_NAME, {"source_id"=>get_source_id})
+                    ::Rhom::RhomDbAdapter.delete_from_table('object_values', {"source_id"=>get_source_id})
                   end
                 end
                     
                 private
-                # returns new model instance with a temp object id
-                def get_new_obj(obj)
-                  tmp_obj = self.new
-                  tmp_obj.send("object=".to_sym(), "{#{obj['object'].to_s}}")
-                  tmp_obj
+                
+                # returns attributes for the source
+                def get_attribs
+                  attribs = ::Rhom::RhomDbAdapter.select_from_table('object_values','attrib', {"source_id"=>get_source_id}, {"distinct"=>true})
+                  attribs.collect! do |attrib|
+                    attrib['attrib']
+                  end
+                  attribs
                 end
                 
                 # get hash of conditions in sql form
@@ -242,14 +243,10 @@ module Rhom
                 update_type=self.get_update_type_by_source('delete')
                 if obj
                   # first delete the record from viewable list
-                  result = ::Rhom::RhomDbAdapter::delete_from_table(::Rhom::TABLE_NAME,
-                                                            {"object"=>obj})
+                  result = ::Rhom::RhomDbAdapter.delete_from_table('object_values', {"object"=>obj})
                   if update_type
                     # now add delete operation
-                    result = ::Rhom::RhomDbAdapter::insert_into_table(::Rhom::TABLE_NAME,
-                                                              {"source_id"=>self.get_inst_source_id,
-                                                               "object"=>obj,
-                                                               "update_type"=>update_type})
+                    result = ::Rhom::RhomDbAdapter.insert_into_table('object_values', {"source_id"=>self.get_inst_source_id, "object"=>obj, "update_type"=>update_type})
                   end
                 end
                 result
@@ -261,21 +258,29 @@ module Rhom
                 # iterate over each instance variable and insert create row to table
 				        obj = self.inst_strip_braces(self.object)
 				        update_type=self.get_update_type_by_source('create')
-                self.instance_variables.each do |method|
-                  method = method.to_s.gsub(/@/,"")
-                  # Don't save objects with braces to database
-                  val = self.inst_strip_braces(self.send(method.to_sym))
-                  # add rows excluding object, source_id and update_type
-                  unless self.method_name_reserved?(method)
-                    fields = {"source_id"=>self.get_inst_source_id,
-                              "object"=>obj,
-                              "attrib"=>method,
-                              "value"=>val,
-                              "update_type"=>update_type}
-                    fields = method == "image_uri" ? fields.merge!({"attrib_type" => "blob.file"}) : fields
-                    result = ::Rhom::RhomDbAdapter::insert_into_table(::Rhom::TABLE_NAME, fields)                                     
-                  end
-                end
+                begin
+                    ::Rhom::RhomDbAdapter.start_transaction
+                
+                    self.vars.each do |key,value|
+                      val = self.inst_strip_braces(value)
+                      # add rows excluding object, source_id and update_type
+                      unless self.method_name_reserved?(key)
+                        fields = {"source_id"=>self.get_inst_source_id,
+                                  "object"=>obj,
+                                  "attrib"=>key,
+                                  "value"=>val,
+                                  "update_type"=>update_type}
+                        fields = key == "image_uri" ? fields.merge!({"attrib_type" => "blob.file"}) : fields
+                        result = ::Rhom::RhomDbAdapter.insert_into_table('object_values', fields)                                     
+                      end
+                    end
+                    
+                    ::Rhom::RhomDbAdapter.commit
+
+                rescue Exception => e
+                    ::Rhom::RhomDbAdapter.rollback    
+                end    
+                
                 result
               end
           
@@ -296,18 +301,13 @@ module Rhom
                   # then we procede with update
                   if old_val != new_val
                     unless self.method_name_reserved?(attrib)
-                      ::Rhom::RhomDbAdapter::delete_from_table(::Rhom::TABLE_NAME,
-                                                                {"source_id"=>self.get_inst_source_id,
-                                                                 "object"=>obj,
-                                                                 "attrib"=>attrib,
-                                                                 "update_type"=>update_type})
-                      # update sync list
-                      result = ::Rhom::RhomDbAdapter::insert_into_table(::Rhom::TABLE_NAME,
-                                                                {"source_id"=>self.get_inst_source_id,
-                                                                 "object"=>obj,
-                                                                 "attrib"=>attrib,
-                                                                 "value"=>new_val,
-                                                                 "update_type"=>update_type})
+                      # only one update at a time
+                      ::Rhom::RhomDbAdapter.delete_from_table('object_values', {"source_id"=>self.get_inst_source_id, "object"=>obj, "attrib"=>attrib, "update_type"=>update_type})
+                      # add to syncengine queue
+                      ::Rhom::RhomDbAdapter.insert_into_table('object_values', {"source_id"=>self.get_inst_source_id, "object"=>obj, "attrib"=>attrib, "value"=>new_val, "update_type"=>update_type})
+                      # update viewable ('query') list
+                      ::Rhom::RhomDbAdapter.delete_from_table('object_values', {"source_id"=>self.get_inst_source_id, "object"=>obj, "attrib"=>attrib, "update_type"=>'query'})
+                      result = ::Rhom::RhomDbAdapter.insert_into_table('object_values', {"source_id"=>self.get_inst_source_id, "object"=>obj, "attrib"=>attrib, "value"=>new_val, "update_type"=>'query'})
                     end
                   end
                 end
@@ -315,11 +315,11 @@ module Rhom
               end
 	
               def get_inst_source_id
-                Rho::RhoConfig::sources[self.class.name.to_s]['source_id'].to_s
+                Rho::RhoConfig.sources[self.class.name.to_s]['source_id'].to_s
               end
               
               def get_update_type_by_source(update_type)
-                source_type = Rho::RhoConfig::sources[self.class.name.to_s]['type']
+                source_type = Rho::RhoConfig.sources[self.class.name.to_s]['type']
                 if source_type and source_type == "ask" and update_type == 'delete'
                   nil
                 elsif source_type and source_type == "ask"