rhodes-framework 1.0.10 → 1.1.0

data/lib/rho/rhofsconnector.rb

@@ -15,6 +15,10 @@ module Rho
       def get_app_manifest_filename
         File.join(__rhoGetCurrentDir(), 'apps/app_manifest.txt')
       end
+      
+      def get_rhoconfig_filename
+        File.join(__rhoGetCurrentDir(), 'apps/rhoconfig.txt')
+      end
 
       def get_model_path(appname, modelname)
         File.join(__rhoGetCurrentDir(), 'apps/'+appname+'/'+modelname+'/')

data/lib/rho/rhoutils.rb

@@ -0,0 +1,26 @@
+module Rho
+  class RhoUtils
+    def self.load_offline_data(tables=[], dir_prefix=nil)
+      first_row=true
+      columns = []
+      tables.each do |filename|
+        Rhom::RhomDbAdapter.delete_all_from_table(filename)
+        prefix = dir_prefix.nil? ? "" : dir_prefix
+        File.open(File.join(Rho::RhoFSConnector.get_base_app_path,'app',prefix,'fixtures',filename+'.txt')).each do |line|
+          if first_row
+            columns = line.chomp.split('|'); first_row = false; next;
+          end
+          parts = line.chomp.split('|')
+
+          row = {}
+          columns.each_with_index do |col,idx| 
+            row[col] = parts[idx]
+          end
+          Rhom::RhomDbAdapter.insert_into_table(filename,row)
+        end
+        columns = []
+        first_row = true
+      end
+    end
+  end
+end

data/lib/rho/rhoviewhelpers.rb

@@ -47,7 +47,7 @@ module Rho
     #
     def link_to(name,url_params = {},html_options = "",confirm = nil)
       url = url_for(url_params)
-      if (url_params[:action].to_s != 'delete')
+      if (url_params.is_a?(String) || url_params[:action].to_s != 'delete')
         "<a href=\"#{url}\" #{html_options}>#{name || url}</a>"
       else
         "<a href=\"#{url}\" #{html_options} onclick=\""+  #if (confirm('#{confirm}')) {

data/lib/rhodes.rb

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

data/lib/rhoframework.rb

@@ -3,19 +3,19 @@ begin
     require 'date/format'
     require 'time'
 
-    require 'sqlite3/constants'
-    require 'sqlite3/errors'
-    require 'sqlite3/pragmas'
+   # require 'sqlite3/constants'
+   # require 'sqlite3/errors'
+   # require 'sqlite3/pragmas'
     
-    require 'sqlite3/resultset'
-    require 'sqlite3/statement'
+   # require 'sqlite3/resultset'
+   # require 'sqlite3/statement'
     
-    require 'date'
-    require 'sqlite3/translator'
+   # require 'date'
+   # require 'sqlite3/translator'
     
-    require 'sqlite3/value'
+   # require 'sqlite3/value'
 
-    require 'sqlite3/database'
+   # require 'sqlite3/database'
     require 'rhom/rhom_db_adapter'
 	
     require 'rhom/rhom_object'

data/lib/rhom/rhom.rb

@@ -21,7 +21,7 @@
 
 require 'rhom/rhom_object_factory'
 require 'rhom/rhom_object'
-if defined? RHO_ME
+if defined? RHO_DBME
 	require 'rhom/rhom_db_adapterME'
 else
 	require 'rhom/rhom_db_adapter'

data/lib/rhom/rhom_db_adapter.rb

@@ -18,7 +18,8 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 #$:.unshift(File.join(File.dirname(__FILE__), '../../'))
-require 'sqlite3/database'
+# require 'sqlite3/database'
+require 'rhodes'
 
 module Rhom
   class RhomDbAdapter
@@ -37,7 +38,7 @@ module Rhom
     
       # closes the database if and only if it is open
       def close
-        if @@database and not @@database.closed?
+        if @@database #and not @@database.closed?
           @@database.close
           @@database = nil
         else
@@ -60,10 +61,10 @@ module Rhom
             SyncEngine::lock_sync_mutex
             # execute sql statement inside of transaction
             # result is returned as an array of hashes
-            @@database.transaction unless @@database.transaction_active?
-            @@database.results_as_hash = true
+            # @@database.transaction unless @@database.transaction_active?
+            # @@database.results_as_hash = true
             result = @@database.execute sql
-            @@database.commit
+            # @@database.commit
             SyncEngine::unlock_sync_mutex
           rescue Exception => e
             puts "exception when running query: #{e}"
@@ -76,9 +77,26 @@ module Rhom
       end
     
       # generates where clause based on hash
-      def where_str(condition)
-        cond = string_from_key_vals(condition," and")
-        cond[0..cond.length - 5]
+      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
+        #puts "where_str: #{where_str}" if where_str
+        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
@@ -91,7 +109,7 @@ module Rhom
       def string_from_key_vals(values, delim)
         vals = ""
         values.each do |key,value|
-          vals << " #{key} = #{get_value_for_sql_stmt(value)}#{delim}"
+          vals << " #{key} = #{get_value_for_sql_stmt(value)} #{delim}"
         end
         vals
       end
@@ -115,16 +133,15 @@ module Rhom
       #                   {"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)
+      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)}"
+            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)} \
-                     order by #{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)}"
+            query = "select #{columns} from #{table} where #{where_str(condition,select_arr)}"
           end
         elsif table and columns
           query = "select #{columns} from #{table}"                     
@@ -192,4 +209,8 @@ module Rhom
       end
     end # class methods
   end # RhomDbAdapter
-end # Rhom
+end # Rhom
+
+at_exit do
+	Rhom::RhomDbAdapter::close
+end

data/lib/rhom/rhom_db_adapterME.rb

@@ -28,10 +28,9 @@ module Rhom
       def open(dbfile=nil)
         puts "DB name = " + dbfile.inspect
         unless @@database or dbfile.nil?
-			db = DbAdapter.new(Rhodes::DBVERSION)
-			@@database = db
+			    db = DbAdapter.new(Rhodes::DBVERSION)
+			    @@database = db
         end
-		
       end
     
       def close

data/lib/rhom/rhom_object.rb

@@ -62,8 +62,20 @@ module Rhom
       arr.last.is_a?(::Hash) ? arr.pop : {}
     end
     
+    @@reserved_names = {"object" => "1",
+                      "source_id" => "1",
+                      "update_type" => "1",
+                      "attrib_type" => "1",
+                      "type" => "1",
+                      "set_notification" => "1",
+                      "clear_notification" => "1" }
+    
+
     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
+      @@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 # RhomObject
 end # Rhom

data/lib/rhom/rhom_object_factory.rb

@@ -41,7 +41,7 @@ module Rhom
               extend ::Rhom::RhomObject
           
               def initialize(obj=nil)
-                self.send("object=".to_sym(), "#{Time.now.to_i}")
+                self.send("object=".to_sym(), "#{((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')
@@ -83,39 +83,70 @@ module Rhom
                   # do we have conditions?
                   # if so, add them to the query
                   condition_hash = {}
-                  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 = 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, '*', conditions, {"order by"=>'object'})
+                    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 condition_hash and condition_hash.size > 0
+                    #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|
-                        full_objects += ::Rhom::RhomDbAdapter::select_from_table(::Rhom::TABLE_NAME, '*', {'object' => obj['object'].to_s})
+                        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
                       end
                       objs = full_objects
                     end
 
                     # build up the object array where each
                     # row in this array is a rhom_object
-                    objs.collect! do |obj|
+                    #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 method_name_reserved?(attrib) and hash_list[object].send(attrib.to_sym)
+                      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 method_name_reserved?(attrib)
-                      nil # remove the element from the array
+                      hash_list[object].send("#{attrib}=".to_sym(), value) if not isReserved
+                      #nil # remove the element from the array
                     end
                     
                   end
-
+                  #hash_objects = nil
+                  
                   # convert hash to array
                   list = hash_list.values
                   hash_list = nil

data/lib/version.rb

@@ -1,8 +1,8 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '1.0.10'
+    VERSION = '1.1.0'
   end
   unless defined? RhodesFramework::DBVERSION
-    DBVERSION = '1.0.10'
+    DBVERSION = '1.1.0'
   end
 end

data/spec/README

@@ -0,0 +1 @@
+This folder contains the specs application for the rhodes-framework.  It should be run as a normal rhodes application.

data/spec/Rakefile

@@ -0,0 +1 @@
+require 'rhodes-build'

data/spec/app/Question/config.rb

@@ -0,0 +1,3 @@
+require 'rho'
+
+Rho::RhoConfig::add_source("Question", {"url"=>"", "source_id"=>400, "type"=>'ask'})

data/spec/app/Settings/controller.rb

@@ -0,0 +1,10 @@
+require 'rho'
+require 'rho/rhocontroller'
+
+class SettingsController < Rho::RhoController
+  
+  def index
+    @msg = @params['msg']
+    render
+  end
+end

data/spec/app/Settings/index.erb

@@ -0,0 +1,11 @@
+<div class="toolbar">
+	<h1 id="pageTitle">
+		Settings
+	</h1>
+</div>
+
+<ul id="settings" selected="true" title="Settings">
+	<% if @msg %><li style="color:#ff0000" align="center"><%=@msg%></li><% end %>
+	<li>Client ID: <br/><span style="font-size: 60%"><%=Rhom::Rhom::client_id%></span></li>
+	<li><%=link_to "Reset Database", :action => :reset%></li>
+</ul>

data/spec/app/SpecRunner/controller.rb

@@ -0,0 +1,15 @@
+require 'rho/rhocontroller'
+require 'spec_runner'
+
+class SpecRunnerController < Rho::RhoController
+
+  #GET /SpecRunner
+  def index
+    @msg = 'MSpec version: '+MSpec::VERSION
+    @runner = SpecRunner.new
+    @code = @runner.run
+    @exc_count = MSpec.exc_count
+    @count = MSpec.count
+    render
+  end
+end

data/spec/app/SpecRunner/index.erb

@@ -0,0 +1,14 @@
+<div class="toolbar">
+	<h1 id="pageTitle">
+		SpecRunner
+	</h1>
+</div>
+
+<%@color = @code == 0 ? "#00ff00" : "#ff0000"%>
+
+<ul id="specrunner" title="SpecRunner" selected="true">
+	<% if @msg %><li style="color:<%=@color%>" align="center"><%=@msg%></li><% end %>
+    <li style="color:<%=@color%>">Total: <%=@count%></li>
+    <li style="color:<%=@color%>">Passed: <%=@count - @exc_count%></li>
+    <li style="color:<%=@color%>">Failed: <%=@exc_count%></li>
+</ul>

data/spec/app/application.rb

@@ -0,0 +1,4 @@
+require 'rho/rhoapplication'
+
+class AppApplication < Rho::RhoApplication
+end

data/spec/app/index.erb

@@ -0,0 +1,17 @@
+<script language="JavaScript">
+		
+if (location.search =='?settings=true') {
+    window.location ='/app/Settings';
+}
+
+</script>
+
+<div class="toolbar">
+	<h1 id="pageTitle">
+		RhodesTest
+	</h1>
+</div>
+
+<ul id="home" selected="true" title="RhodesSpecs">
+	<li><a href="SpecRunner">Run Specs!</a></li>
+</ul>

data/spec/app/layout.erb

@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>RhodesTest</title>
+		<link href="/public/css/base.css" type="text/css" rel="stylesheet"/>		
+			
+		<% if System::get_property('platform') == 'APPLE' %>
+			<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
+
+			<script src="/public/js/jquery-1.2.6.min.js"></script>
+			<script src="/public/js/rho.js"></script>
+			<script src="/public/js/application.js"></script> 
+			<link href="/public/css/iphone.css" type="text/css" rel="stylesheet"/>
+		<% else %>
+			<% if System::get_property('platform') == 'Blackberry' %>
+				<link href="/public/css/blackberry.css" type="text/css" rel="stylesheet"/>	
+			<% else %>	
+				<link href="/public/css/xhtml.css" type="text/css" rel="stylesheet"/>	
+			<% end %>
+		<% end %>	
+				
+	</head>
+	<body>
+		<%= @content %>
+	</body>
+</html>