rhodes-framework 1.2.0 → 1.2.1

data/Manifest.txt

@@ -37,7 +37,6 @@ lib/rhom/rhom_source.rb
 lib/singleton.rb
 lib/time.rb
 lib/version.rb
-rhodes-framework.gemspec
 spec/README
 spec/Rakefile
 spec/app/Account/config.rb

data/lib/rhodes.rb

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

data/lib/rhom/rhom.rb

@@ -1,71 +1,71 @@
-#
-#  rhom.rb
-#  rhodes
-#  This module represents the rhodes mini OM
-#
-#  Copyright (C) 2008 Rhomobile, Inc. All rights reserved.
-#
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  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/rhom_object_factory'
-require 'rhom/rhom_object'
-require 'rhom/rhom_db_adapter'
-
-module Rhom
-  UPDATE_TYPES = ["'create'","'query'","'ask'"]
-  
-  class RecordNotFound < StandardError
-  end
-  
-  class Rhom
-    attr_accessor :factory
-  
-    def initialize
-      @factory = RhomObjectFactory.new
-    end
-    
-    class << Rhom
-      def client_id
-        c_id = ::Rhom::RhomDbAdapter.select_from_table('client_info','client_id')[0]
-        c_id.nil? ? nil : c_id['client_id']
-      end
-      
-      def database_full_reset
-        SyncEngine.stop_sync
-        
-        ::Rhom::RhomDbAdapter.execute_sql("UPDATE client_info SET reset=1")
-
-        if defined? RHO_ME
-            ::Rhom::RhomDbAdapter.execute_sql("UPDATE sources SET token=NULL")
-        else
-            ::Rhom::RhomDbAdapter.execute_sql("UPDATE sources SET token=0")
-        end
-        
-        if defined? RHO_DBME
-            ::Rhom::RhomDbAdapter.destroy_table('object_values')
-            #::Rhom::RhomDbAdapter.delete_all_from_table('object_values')
-        else
-            ::Rhom::RhomDbAdapter.delete_all_from_table('object_values')
-            ::Rhom::RhomDbAdapter.execute_sql("VACUUM")
-        end    
-      end
-      
-      def database_full_reset_and_logout
-        database_full_reset
-        SyncEngine.logout
-      end
-    end #class methods
-  end # Rhom
-end # Rhom
+#
+#  rhom.rb
+#  rhodes
+#  This module represents the rhodes mini OM
+#
+#  Copyright (C) 2008 Rhomobile, Inc. All rights reserved.
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  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/rhom_object_factory'
+require 'rhom/rhom_object'
+require 'rhom/rhom_db_adapter'
+
+module Rhom
+  UPDATE_TYPES = ["'create'","'query'","'ask'"]
+  
+  class RecordNotFound < StandardError
+  end
+  
+  class Rhom
+    attr_accessor :factory
+  
+    def initialize
+      @factory = RhomObjectFactory.new
+    end
+    
+    class << Rhom
+      def client_id
+        c_id = ::Rhom::RhomDbAdapter.select_from_table('client_info','client_id')[0]
+        c_id.nil? ? nil : c_id['client_id']
+      end
+      
+      def database_full_reset
+        SyncEngine.stop_sync
+        
+        ::Rhom::RhomDbAdapter.execute_sql("UPDATE client_info SET reset=1")
+
+        if defined? RHO_ME
+            ::Rhom::RhomDbAdapter.execute_sql("UPDATE sources SET token=NULL")
+        else
+            ::Rhom::RhomDbAdapter.execute_sql("UPDATE sources SET token=0")
+        end
+        
+#        if defined? RHO_DBME
+            ::Rhom::RhomDbAdapter.destroy_table('object_values')
+            #::Rhom::RhomDbAdapter.delete_all_from_table('object_values')
+#        else
+#            ::Rhom::RhomDbAdapter.delete_all_from_table('object_values')
+#            ::Rhom::RhomDbAdapter.execute_sql("VACUUM")
+#        end    
+      end
+      
+      def database_full_reset_and_logout
+        database_full_reset
+        SyncEngine.logout
+      end
+    end #class methods
+  end # Rhom
+end # Rhom

data/lib/rhom/rhom_db_adapter.rb

@@ -1,249 +1,252 @@
-#
-#  rhom_db_adapter.rb
-#  rhodes
-#
-#  Copyright (C) 2008 Rhomobile, Inc. All rights reserved.
-#
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  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 'rhodes'
-
-module Rhom
-  class RhomDbAdapter
-    
-    @@database = nil
-    @@inside_transaction = false
-    
-    class << self
-      
-      # maintains a single database connection
-      def open(dbfile=nil)
-        unless @@database or dbfile.nil?
-          @@database = SQLite3::Database.new(dbfile)
-        end
-      end
-    
-      # closes the database if and only if it is open
-      def close
-        if @@database
-          @@database.close
-          @@database = nil
-        else
-          return false
-        end
-        return true
-      end   
-    
-      def start_transaction
-          begin
-            @@inside_transaction = true
-            @@database.start_transaction
-          rescue Exception => e
-            puts "exception when start_transaction"
-          end
-      end
-
-      def commit
-          begin
-            @@inside_transaction = false
-            @@database.commit
-          rescue Exception => e
-            puts "exception when commit transaction"
-          end
-      end
-
-      def rollback
-          begin
-            @@inside_transaction = false
-            @@database.rollback
-          rescue Exception => e
-            puts "exception when rollback transaction"
-          end
-      end
-    
-      # execute a sql statement
-      # optionally, disable the factory processing 
-      # which returns the result array directly
-      def execute_sql(sql=nil)
-        result = []
-        if sql
-          #puts "RhomDbAdapter: Executing query - #{sql}"
-          # Make sure we lock the sync engine's mutex
-          # before we perform a database transaction.
-          # This prevents concurrency issues.
-          begin
-            SyncEngine.lock_sync_mutex unless @@inside_transaction
-            result = @@database.execute sql
-            SyncEngine.unlock_sync_mutex unless @@inside_transaction
-          rescue Exception => e
-            #puts "exception when running query: #{e}"
-            # make sure we unlock even if there's an error!
-            if @@inside_transaction
-              raise
-            else
-              SyncEngine.unlock_sync_mutex
-            end    
-          end
-        end
-        #puts "result is: #{result.inspect}"
-        result
-      end
-    
-      # generates where clause based on hash
-      def where_str(condition,select_arr=nil)
-        where_str = ""
-        if condition
-          where_str += string_from_key_vals(condition,"and")
-          where_str = where_str[0..where_str.length - 5]
-        end
-        
-        if select_arr and select_arr.length > 0
-          where_str += " and attrib in (#{select_str(select_arr)})"
-        end
-        where_str
-      end
-      
-      def select_str(select_arr)
-        select_str = ""
-        select_arr.each do |attrib|
-          select_str << "'#{attrib}'" + ","
-        end
-        select_str.length > 2 ? select_str[0..select_str.length-2] : select_str
-      end
-    
-      # generates value clause based on hash
-      def vals_str(values)
-        vals = string_from_key_vals(values, ",")
-        vals[0..vals.length - 2]
-      end
-      
-      # generates key/value list
-      def string_from_key_vals(values, delim)
-        vals = ""
-        values.each do |key,value|
-          op = value.nil? ? 'is ' : '= '
-          vals << " \"#{key}\" #{op} #{get_value_for_sql_stmt(value)} #{delim}"
-        end
-        vals
-      end
-      
-      # generates a value for sql statement
-      def get_value_for_sql_stmt(value)
-        if value.nil? or value == 'NULL'
-          "NULL"
-        elsif value.is_a?(String)
-          "'#{value}'"
-        else
-          "'#{value.to_s}'"
-        end
-      end
-    
-      # support for select statements
-      # this function takes table name, columns (as a comma-separated list),
-      # condition (as a hash), and params (as a hash)
-      # example usage is the following:
-      # select_from_table('object_values', '*', {"source_id"=>2,"update_type"=>'query'},
-      #                   {"order by"=>'object'})
-      # this would return all columns where source_id = 2 and update_type = 'query' ordered
-      # by the "object" column
-      def select_from_table(table=nil,columns=nil,condition=nil,params=nil,select_arr=nil)
-        query = nil
-        if table and columns and condition
-          if params and params['distinct']
-            query = "select distinct #{columns} from #{table} where #{where_str(condition,select_arr)}"
-          elsif params and params['order by']
-            query = "select #{columns} from #{table} where #{where_str(condition,select_arr)} order by #{params['order by']}"
-          else
-            query = "select #{columns} from #{table} where #{where_str(condition,select_arr)}"
-          end
-        elsif table and columns
-          query = "select #{columns} from #{table}"                     
-        end
-        execute_sql query
-      end
-    
-      # inserts a single row into the database
-      # takes the table name and values (hash) as arguments
-      # exmaple usage is the following:
-      # insert_into_table('object_values, {"source_id"=>1,"object"=>"some-object","update_type"=>'delete'})
-      # this would execute the following sql:
-      # insert into object_values (source_id,object,update_type) values (1,'some-object','delete');
-      def insert_into_table(table=nil,values=nil)
-        query = nil
-        cols = ""
-        vals = ""
-        if table and values
-          values.each do |key,val|
-            value = get_value_for_sql_stmt(val)+","
-            cols << "#{key},"
-            vals << value
-          end
-          cols = cols[0..cols.length - 2]
-          vals = vals[0..vals.length - 2]
-          query = "insert into #{table} (#{cols}) values (#{vals})"
-        end
-        execute_sql query
-      end
-    
-      # deletes rows from a table which satisfy condition (hash)
-      # example usage is the following:
-      # delete_from_table('object_values',{"object"=>"some-object"})
-      # this would execute the following sql:
-      # delete from object_values where object="some-object"
-      def delete_from_table(table=nil,condition=nil)
-        query = nil
-        if table and condition
-          query = "delete from #{table} where #{where_str(condition)}"
-        end
-        execute_sql query
-      end
-    
-      # deletes all rows from a given table
-      def delete_all_from_table(table=nil)
-        query = nil
-        if table
-          query = "delete from #{table}"
-        end
-        execute_sql query
-      end
-
-      # deletes all rows from a given table by recreating db-file and save all other tables
-      def destroy_table(table)
-        query = nil
-        if table
-          query = "destroy #{table}"
-        end
-        execute_sql query
-      end
-      
-      # updates values (hash) in a given table which satisfy condition (hash)
-      # example usage is the following:
-      # update_into_table('object_values',{"value"=>"Electronics"},{"object"=>"some-object", "attrib"=>"industry"})
-      # this executes the following sql:
-      # update table object_values set value='Electronics' where object='some-object' and attrib='industry';
-      def update_into_table(table=nil,values=nil,condition=nil)
-        query = nil
-        vals = values.nil? ? nil : vals_str(values)
-        if table and condition and vals
-          query = "update #{table} set #{vals} where #{where_str(condition)}"
-        end
-        execute_sql query
-      end
-    end # class methods
-  end # RhomDbAdapter
-end # Rhom
-
-at_exit do
-	::Rhom::RhomDbAdapter.close
-end
+#
+#  rhom_db_adapter.rb
+#  rhodes
+#
+#  Copyright (C) 2008 Rhomobile, Inc. All rights reserved.
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  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 'rhodes'
+
+module Rhom
+  class RhomDbAdapter
+    
+    @@database = nil
+    @@inside_transaction = false
+    
+    class << self
+      
+      # maintains a single database connection
+      def open(dbfile=nil)
+        unless @@database or dbfile.nil?
+          @@database = SQLite3::Database.new(dbfile)
+        end
+      end
+    
+      # closes the database if and only if it is open
+      def close
+        if @@database
+          @@database.close
+          @@database = nil
+        else
+          return false
+        end
+        return true
+      end   
+    
+      def start_transaction
+          begin
+            @@inside_transaction = true
+            @@database.start_transaction
+          rescue Exception => e
+            puts "exception when start_transaction"
+          end
+      end
+
+      def commit
+          begin
+            @@inside_transaction = false
+            @@database.commit
+          rescue Exception => e
+            puts "exception when commit transaction"
+          end
+      end
+
+      def rollback
+          begin
+            @@inside_transaction = false
+            @@database.rollback
+          rescue Exception => e
+            puts "exception when rollback transaction"
+          end
+      end
+    
+      # execute a sql statement
+      # optionally, disable the factory processing 
+      # which returns the result array directly
+      def execute_sql(sql=nil)
+        result = []
+        if sql
+          #puts "RhomDbAdapter: Executing query - #{sql}"
+          # Make sure we lock the sync engine's mutex
+          # before we perform a database transaction.
+          # This prevents concurrency issues.
+          begin
+            SyncEngine.lock_sync_mutex unless @@inside_transaction
+            result = @@database.execute sql
+            SyncEngine.unlock_sync_mutex unless @@inside_transaction
+          rescue Exception => e
+            #puts "exception when running query: #{e}"
+            # make sure we unlock even if there's an error!
+            if @@inside_transaction
+              raise
+            else
+              SyncEngine.unlock_sync_mutex
+            end    
+          end
+        end
+        #puts "result is: #{result.inspect}"
+        result
+      end
+    
+      # generates where clause based on hash
+      def where_str(condition,select_arr=nil)
+        where_str = ""
+        if condition
+          where_str += string_from_key_vals(condition,"and")
+          where_str = where_str[0..where_str.length - 5]
+        end
+        
+        if select_arr and select_arr.length > 0
+          where_str += " and attrib in (#{select_str(select_arr)})"
+        end
+        where_str
+      end
+      
+      def select_str(select_arr)
+        select_str = ""
+        select_arr.each do |attrib|
+          select_str << "'#{attrib}'" + ","
+        end
+        select_str.length > 2 ? select_str[0..select_str.length-2] : select_str
+      end
+    
+      # generates value clause based on hash
+      def vals_str(values)
+        vals = string_from_key_vals(values, ",")
+        vals[0..vals.length - 2]
+      end
+      
+      # generates key/value list
+      def string_from_key_vals(values, delim)
+        vals = ""
+        values.each do |key,value|
+          op = value.nil? ? 'is ' : '= '
+          vals << " \"#{key}\" #{op} #{get_value_for_sql_stmt(value)} #{delim}"
+        end
+        vals
+      end
+      
+      # generates a value for sql statement
+      def get_value_for_sql_stmt(value)
+        if value.nil? or value == 'NULL'
+          "NULL"
+        elsif value.is_a?(String)
+          "'#{value}'"
+        else
+          "'#{value.to_s}'"
+        end
+      end
+    
+      # support for select statements
+      # this function takes table name, columns (as a comma-separated list),
+      # condition (as a hash), and params (as a hash)
+      # example usage is the following:
+      # select_from_table('object_values', '*', {"source_id"=>2,"update_type"=>'query'},
+      #                   {"order by"=>'object'})
+      # this would return all columns where source_id = 2 and update_type = 'query' ordered
+      # by the "object" column
+      def select_from_table(table=nil,columns=nil,condition=nil,params=nil,select_arr=nil)
+        query = nil
+        if table and columns and condition
+          if params and params['distinct']
+            query = "select distinct #{columns} from #{table} where #{where_str(condition,select_arr)}"
+          elsif params and params['order by']
+            query = "select #{columns} from #{table} where #{where_str(condition,select_arr)} order by #{params['order by']}"
+          else
+            query = "select #{columns} from #{table} where #{where_str(condition,select_arr)}"
+          end
+        elsif table and columns
+          query = "select #{columns} from #{table}"                     
+        end
+        execute_sql query
+      end
+    
+      # inserts a single row into the database
+      # takes the table name and values (hash) as arguments
+      # exmaple usage is the following:
+      # insert_into_table('object_values, {"source_id"=>1,"object"=>"some-object","update_type"=>'delete'})
+      # this would execute the following sql:
+      # insert into object_values (source_id,object,update_type) values (1,'some-object','delete');
+      def insert_into_table(table=nil,values=nil)
+        query = nil
+        cols = ""
+        vals = ""
+        if table and values
+          values.each do |key,val|
+            value = get_value_for_sql_stmt(val)+","
+            cols << "#{key},"
+            vals << value
+          end
+          cols = cols[0..cols.length - 2]
+          vals = vals[0..vals.length - 2]
+          query = "insert into #{table} (#{cols}) values (#{vals})"
+        end
+        execute_sql query
+      end
+    
+      # deletes rows from a table which satisfy condition (hash)
+      # example usage is the following:
+      # delete_from_table('object_values',{"object"=>"some-object"})
+      # this would execute the following sql:
+      # delete from object_values where object="some-object"
+      def delete_from_table(table=nil,condition=nil)
+        query = nil
+        if table and condition
+          query = "delete from #{table} where #{where_str(condition)}"
+        end
+        execute_sql query
+      end
+    
+      # deletes all rows from a given table
+      def delete_all_from_table(table=nil)
+        query = nil
+        if table
+          query = "delete from #{table}"
+        end
+        execute_sql query
+      end
+
+      # deletes all rows from a given table by recreating db-file and save all other tables
+      def destroy_table(table)
+          begin
+            SyncEngine.lock_sync_mutex unless @@inside_transaction
+            @@database.destroy_table table
+            SyncEngine.unlock_sync_mutex unless @@inside_transaction
+          rescue Exception => e
+            SyncEngine.unlock_sync_mutex
+            raise
+          end
+      end
+      
+      # updates values (hash) in a given table which satisfy condition (hash)
+      # example usage is the following:
+      # update_into_table('object_values',{"value"=>"Electronics"},{"object"=>"some-object", "attrib"=>"industry"})
+      # this executes the following sql:
+      # update table object_values set value='Electronics' where object='some-object' and attrib='industry';
+      def update_into_table(table=nil,values=nil,condition=nil)
+        query = nil
+        vals = values.nil? ? nil : vals_str(values)
+        if table and condition and vals
+          query = "update #{table} set #{vals} where #{where_str(condition)}"
+        end
+        execute_sql query
+      end
+    end # class methods
+  end # RhomDbAdapter
+end # Rhom
+
+at_exit do
+	::Rhom::RhomDbAdapter.close
+end