rhodes-framework 1.0.10 → 1.1.0

data/Manifest.txt

@@ -1,10 +1,7 @@
 .gitignore
-History.txt
 Manifest.txt
-README.rdoc
 Rakefile
 lib/ServeME.rb
-lib/TestServe.rb
 lib/bsearch.rb
 lib/builtinME.rb
 lib/date.rb
@@ -22,6 +19,7 @@ lib/rho/rhocontact.rb
 lib/rho/rhocontroller.rb
 lib/rho/rhofsconnector.rb
 lib/rho/rhosupport.rb
+lib/rho/rhoutils.rb
 lib/rho/rhoviewhelpers.rb
 lib/rhodes-framework.rb
 lib/rhodes.rb
@@ -37,31 +35,162 @@ lib/rhom/rhom_source.rb
 lib/singleton.rb
 lib/time.rb
 lib/version.rb
-res/sqlite3/constants.rb
-res/sqlite3/database.rb
-res/sqlite3/driver/dl/api.rb
-res/sqlite3/driver/dl/driver.rb
-res/sqlite3/driver/native/driver.rb
-res/sqlite3/errors.rb
-res/sqlite3/pragmas.rb
-res/sqlite3/resultset.rb
-res/sqlite3/sqlite3_api.rb
-res/sqlite3/statement.rb
-res/sqlite3/translator.rb
-res/sqlite3/value.rb
-res/sqlite3/version.rb
 rhodes-framework.gemspec
-rhodes.gemspec
-spec/app_manifest.txt
-spec/configs/account.rb
-spec/configs/case.rb
-spec/configs/contact.rb
-spec/configs/employee.rb
-spec/rho_controller_spec.rb
-spec/rho_spec.rb
-spec/rhom_object_factory_spec.rb
-spec/rhom_spec.rb
-spec/spec.opts
-spec/spec_helper.rb
-spec/stubs.rb
-spec/syncdbtest.sqlite
+spec/README
+spec/Rakefile
+spec/app/Account/config.rb
+spec/app/Case/config.rb
+spec/app/Question/config.rb
+spec/app/Settings/controller.rb
+spec/app/Settings/index.erb
+spec/app/SpecRunner/controller.rb
+spec/app/SpecRunner/index.erb
+spec/app/application.rb
+spec/app/index.erb
+spec/app/layout.erb
+spec/app/loading.html
+spec/app/mspec.rb
+spec/app/mspec/expectations.rb
+spec/app/mspec/expectations/expectations.rb
+spec/app/mspec/expectations/should.rb
+spec/app/mspec/fileutils.rb
+spec/app/mspec/guards.rb
+spec/app/mspec/guards/background.rb
+spec/app/mspec/guards/bug.rb
+spec/app/mspec/guards/compliance.rb
+spec/app/mspec/guards/conflict.rb
+spec/app/mspec/guards/endian.rb
+spec/app/mspec/guards/extensions.rb
+spec/app/mspec/guards/guard.rb
+spec/app/mspec/guards/noncompliance.rb
+spec/app/mspec/guards/platform.rb
+spec/app/mspec/guards/quarantine.rb
+spec/app/mspec/guards/runner.rb
+spec/app/mspec/guards/superuser.rb
+spec/app/mspec/guards/support.rb
+spec/app/mspec/guards/tty.rb
+spec/app/mspec/guards/version.rb
+spec/app/mspec/helpers.rb
+spec/app/mspec/helpers/argv.rb
+spec/app/mspec/helpers/bignum.rb
+spec/app/mspec/helpers/const_lookup.rb
+spec/app/mspec/helpers/environment.rb
+spec/app/mspec/helpers/fixture.rb
+spec/app/mspec/helpers/flunk.rb
+spec/app/mspec/helpers/io.rb
+spec/app/mspec/helpers/language_version.rb
+spec/app/mspec/helpers/ruby_exe.rb
+spec/app/mspec/helpers/scratch.rb
+spec/app/mspec/helpers/tmp.rb
+spec/app/mspec/matchers.rb
+spec/app/mspec/matchers/base.rb
+spec/app/mspec/matchers/be_an_instance_of.rb
+spec/app/mspec/matchers/be_ancestor_of.rb
+spec/app/mspec/matchers/be_close.rb
+spec/app/mspec/matchers/be_empty.rb
+spec/app/mspec/matchers/be_false.rb
+spec/app/mspec/matchers/be_kind_of.rb
+spec/app/mspec/matchers/be_nil.rb
+spec/app/mspec/matchers/be_true.rb
+spec/app/mspec/matchers/complain.rb
+spec/app/mspec/matchers/eql.rb
+spec/app/mspec/matchers/equal.rb
+spec/app/mspec/matchers/equal_element.rb
+spec/app/mspec/matchers/equal_utf16.rb
+spec/app/mspec/matchers/have_constant.rb
+spec/app/mspec/matchers/have_instance_method.rb
+spec/app/mspec/matchers/have_method.rb
+spec/app/mspec/matchers/have_private_instance_method.rb
+spec/app/mspec/matchers/include.rb
+spec/app/mspec/matchers/match_yaml.rb
+spec/app/mspec/matchers/method.rb
+spec/app/mspec/matchers/output.rb
+spec/app/mspec/matchers/output_to_fd.rb
+spec/app/mspec/matchers/raise_error.rb
+spec/app/mspec/matchers/respond_to.rb
+spec/app/mspec/matchers/stringsymboladapter.rb
+spec/app/mspec/mocks.rb
+spec/app/mspec/mocks/mock.rb
+spec/app/mspec/mocks/object.rb
+spec/app/mspec/mocks/proxy.rb
+spec/app/mspec/pp.rb
+spec/app/mspec/runner.rb
+spec/app/mspec/runner/actions.rb
+spec/app/mspec/runner/actions/debug.rb
+spec/app/mspec/runner/actions/filter.rb
+spec/app/mspec/runner/actions/gdb.rb
+spec/app/mspec/runner/actions/tag.rb
+spec/app/mspec/runner/actions/taglist.rb
+spec/app/mspec/runner/actions/tagpurge.rb
+spec/app/mspec/runner/actions/tally.rb
+spec/app/mspec/runner/actions/timer.rb
+spec/app/mspec/runner/context.rb
+spec/app/mspec/runner/example.rb
+spec/app/mspec/runner/exception.rb
+spec/app/mspec/runner/filters.rb
+spec/app/mspec/runner/filters/match.rb
+spec/app/mspec/runner/filters/profile.rb
+spec/app/mspec/runner/filters/regexp.rb
+spec/app/mspec/runner/filters/tag.rb
+spec/app/mspec/runner/formatters.rb
+spec/app/mspec/runner/formatters/describe.rb
+spec/app/mspec/runner/formatters/dotted.rb
+spec/app/mspec/runner/formatters/file.rb
+spec/app/mspec/runner/formatters/html.rb
+spec/app/mspec/runner/formatters/method.rb
+spec/app/mspec/runner/formatters/specdoc.rb
+spec/app/mspec/runner/formatters/spinner.rb
+spec/app/mspec/runner/formatters/summary.rb
+spec/app/mspec/runner/formatters/unit.rb
+spec/app/mspec/runner/formatters/yaml.rb
+spec/app/mspec/runner/mspec.rb
+spec/app/mspec/runner/object.rb
+spec/app/mspec/runner/shared.rb
+spec/app/mspec/runner/tag.rb
+spec/app/mspec/utils/name_map.rb
+spec/app/mspec/utils/options.rb
+spec/app/mspec/utils/ruby_name.rb
+spec/app/mspec/utils/script.rb
+spec/app/mspec/utils/version.rb
+spec/app/mspec/version.rb
+spec/app/spec/fixtures/client_info.txt
+spec/app/spec/fixtures/object_values.txt
+spec/app/spec/rho_controller_spec.rb
+spec/app/spec/rho_spec.rb
+spec/app/spec/rhom_object_factory_spec.rb
+spec/app/spec/rhom_spec.rb
+spec/app/spec/spec_helper.rb
+spec/app/spec/webview_spec.rb
+spec/app/spec_runner.rb
+spec/build.yml
+spec/public/css/base.css
+spec/public/css/blackberry.css
+spec/public/css/iphone.css
+spec/public/css/rho.css
+spec/public/css/xhtml.css
+spec/public/images/IUI_LICENSE.txt
+spec/public/images/backButton.png
+spec/public/images/blueButton.png
+spec/public/images/cancel.png
+spec/public/images/grayButton.png
+spec/public/images/iui-logo-touch-icon.png
+spec/public/images/listArrow.png
+spec/public/images/listArrowSel.png
+spec/public/images/listGroup.png
+spec/public/images/loading.gif
+spec/public/images/pinstripes.png
+spec/public/images/right_button.png
+spec/public/images/selection.png
+spec/public/images/thumb.png
+spec/public/images/toggle.png
+spec/public/images/toggleOn.png
+spec/public/images/toolButton.png
+spec/public/images/toolButton_new.png
+spec/public/images/toolbar.png
+spec/public/images/whiteButton.png
+spec/public/js/application.js
+spec/public/js/jquery-1.2.6.min.js
+spec/public/js/rho.js
+spec/public/js/rhogeolocation-wm.js
+spec/public/js/rhogeolocation.js
+spec/rhoconfig.txt

data/Rakefile

@@ -1,4 +1,4 @@
-%w[rubygems rake rake/clean fileutils newgem spec/rake/spectask].each { |f| require f }
+%w[rubygems rake rake/clean fileutils newgem].each { |f| require f }
 $:.unshift(File.join(File.dirname(__FILE__), 'lib'))
 require 'lib/version.rb'
 
@@ -8,7 +8,7 @@ task :default => [:spec]
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
 $hoe = Hoe.new('rhodes-framework', RhodesFramework::VERSION) do |p|
   p.developer('Rhomobile Dev', 'dev@rhomobile.com')
-  p.changes              = p.paragraphs_of("../History.txt", 0..1).join("\n\n")  if File.exists? "../History.txt"
+  #p.changes              = p.paragraphs_of("../History.txt", 0..1).join("\n\n")  if File.exists? "../History.txt"
   #p.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
   p.rubyforge_name       = p.name # TODO this is default value
   p.extra_deps         = [
@@ -30,20 +30,4 @@ $hoe = Hoe.new('rhodes-framework', RhodesFramework::VERSION) do |p|
   
 end
 
-require 'newgem/tasks' # load /tasks/*.rake
-# remove test task TODO: why does this run anyway?
-Rake.application.remove_task(:test)
-Dir['tasks/**/*.rake'].each { |t| load t }
-
-desc "Run the specs under spec"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.rcov = true
-  t.rcov_opts = ['--include',
-                 '"lib/rhom/*,lib/rho/*"',
-                 '-x',
-                 'spec,gems,sqlite3/*,lib/date.rb,lib/rational.rb,lib/time.rb,lib/find.rb,config.rb,lib/erb.rb,lib/singleton.rb,lib/pairparser.rb',
-                 '--text-report',
-                 '--html']
-end
+require 'newgem/tasks'

data/lib/erb.rb

@@ -720,7 +720,7 @@ class ERB
     compiler.insert_cmd = "#{eoutvar}.concat"
 
     cmd = []
-    cmd.push "#{eoutvar} = ''"
+    cmd.push "#{eoutvar} = ''; #{eoutvar}.force_encoding('utf-8')"
     
     compiler.pre_cmd = cmd
 

data/lib/rho/rho.rb

@@ -7,9 +7,10 @@ require 'rhofsconnector'
 module Rho
   class RHO
     APPLICATIONS = {}
-	
+    
     def initialize(app_manifest_filename=nil)
       puts "Calling RHO.initialize"
+      process_rhoconfig
       Rhom::RhomDbAdapter::open(Rho::RhoFSConnector::get_db_fullpathname)
       if app_manifest_filename
         process_model_dirs(app_manifest_filename)
@@ -31,6 +32,23 @@ module Rho
       end
     end
     
+    # Return the directories where we need to load configuration files
+    def process_rhoconfig
+      begin
+        File.open(Rho::RhoFSConnector.get_rhoconfig_filename).each do |line|
+          parts = line.chop.split('=')
+          key = parts[0]
+          value = parts[1..parts.length-1].join('=') if parts and parts.length > 1
+          if key and value
+            tmp = value.strip!
+            Rho::RhoConfig.config[key.strip] = tmp.gsub(/'|"/,'') if tmp
+          end  
+        end
+      rescue Exception => e
+        puts "Error opening rhoconfig.txt: #{e}, using defaults."
+      end
+    end
+    
     # setup the sources table and model attributes for all applications
     def init_sources
       if defined? Rho::RhoConfig::sources
@@ -39,7 +57,7 @@ module Rho
         uniq_sources = Rho::RhoConfig::sources.values.inject([]) { |result,h| 
           result << h unless result.include?(h); result
         }
-		
+        
         # generate unique source list in database for sync
         uniq_sources.each do |source|
           
@@ -56,7 +74,7 @@ module Rho
     def source_initialized?(source_id)
       Rhom::RhomDbAdapter::select_from_table('sources','*', 'source_id'=>source_id).size > 0 ? true : false
     end
-	
+    
     def get_app(appname)
       if (APPLICATIONS[appname].nil?)
         require RhoApplication::get_app_path(appname)+'application'
@@ -66,66 +84,50 @@ module Rho
       APPLICATIONS[appname]
     end
 
-    def get_start_path
-      Rho::RhoConfig.start_path
-    end
-    
-    def get_options_path
-      Rho::RhoConfig.options_path
-    end
-    
-    def get_rhobundle_zip_url
-      Rho::RhoConfig.rhobundle_zip_url
-    end
-    
-    def get_rhobundle_zip_pwd
-      Rho::RhoConfig.rhobundle_zip_pwd
-    end
-
     def serve(req)
       begin
-	    puts 'inside RHO.serve...'
+        puts 'inside RHO.serve...'
         res = init_response
         get_app(req['application']).send :serve, req, res
         return send_response(res)
       rescue Exception => e
         return send_error(e)
-      end	
+      end   
     end
 
     def serve_hash(req)
-		begin
-			puts 'inside RHO.serve...'
-			res = init_response
-			get_app(req['application']).send :serve, req, res
-			return send_response_hash(res)
-		rescue Exception => e
-			return send_error(e,500,true)
-		end	
-    end
-	
-	def serve_index(index_name)
-		begin
-			puts 'inside RHO.serve_index: ' + index_name
-			res = init_response
-			res['request-body'] = RhoController::renderfile(index_name)
-			return send_response(res)
-		rescue Exception => e
-			return send_error(e)
-		end
-	end
+        begin
+            puts 'inside RHO.serve...'
+            res = init_response
+            get_app(req['application']).send :serve, req, res
+            return send_response_hash(res)
+        rescue Exception => e
+            return send_error(e,500,true)
+        end 
+    end
+    
+    def serve_index(index_name)
+        begin
+            puts 'inside RHO.serve_index: ' + index_name
+            res = init_response
+            res['request-body'] = RhoController::renderfile(index_name)
+            return send_response(res)
+        rescue Exception => e
+            return send_error(e)
+        end
+    end
 
-	def serve_index_hash(index_name)
-		begin
-			puts 'inside RHO.serve_index: ' + index_name
-			res = init_response
-			res['request-body'] = RhoController::renderfile(index_name)
-			return send_response_hash(res)
-		rescue Exception => e
-			return send_error(e.message, 500, true)
-		end
-	end
-	
+    def serve_index_hash(index_name)
+        begin
+            puts 'inside RHO.serve_index: ' + index_name
+            res = init_response
+            res['request-body'] = RhoController::renderfile(index_name)
+            return send_response_hash(res)
+        rescue Exception => e
+            return send_error(e.message, 500, true)
+        end
+    end
+    
     def init_response(status=200,message="OK",body="")
       res = Hash.new
       res['status'] = status
@@ -144,7 +146,7 @@ module Rho
     CR   = "\x0d"
     LF   = "\x0a"
     CRLF = "\x0d\x0a"
-	
+    
     def send_response(res)
       res['headers']['Content-Length'] = res['request-body'].nil? ? 0 : res['request-body'].length
       data = "HTTP/1.1 #{res['status'].to_s} #{res['message']}" + CRLF
@@ -152,43 +154,52 @@ module Rho
         tmp = key.gsub(/\bwww|^te$|\b\w/){|s| s.upcase }
         data << "#{tmp}: #{value}" << CRLF
       }
+    data << "Pragma: no-cache" << CRLF
+    data << "Cache-Control: must-revalidate" << CRLF
+    data << "Cache-Control: no-cache" << CRLF
+    data << "Cache-Control: no-store" << CRLF
+    data << "Expires: 0" << CRLF
+
       data << CRLF
-      data << res['request-body']
+	  if ( !res['request-body'].nil? )
+		data << res['request-body']
+	  end
+	  	
       data
     end
 
     def send_response_hash(res)
-		resp = Hash.new
-		res['headers']['Content-Length'] = res['request-body'].nil? ? 0 : res['request-body'].length
-		res['headers'].each{|key, value|
-			tmp = key.gsub(/\bwww|^te$|\b\w/){|s| s.upcase }
-			resp[tmp] = value
-		}
+        resp = Hash.new
+        res['headers']['Content-Length'] = res['request-body'].nil? ? 0 : res['request-body'].length
+        res['headers'].each{|key, value|
+            tmp = key.gsub(/\bwww|^te$|\b\w/){|s| s.upcase }
+            resp[tmp] = value
+        }
         resp['request-body'] = res['request-body']
         resp['status'] = res['status']        
         resp['message'] = res['message']
         
-		resp
+        resp
     end
-	
+    
     def send_error(exception=nil,status=500,hash=false)
       body=''
       body << <<-_HTML_STRING_
-		<html>
-			<head>
-				<title>Server Error</title>
-				<meta name="viewport" content="width=320"/>
-			</head>
-			<body>
-				<p>
+        <html>
+            <head>
+                <title>Server Error</title>
+                <meta name="viewport" content="width=320"/>
+            </head>
+            <body>
+                <p>
       _HTML_STRING_
       body << 'Error: ' << exception.message << "<br/>" if exception
       body << 'Trace: ' << exception.backtrace.join("\n") if exception
       body << <<-_HTML_STRING_
-				</p>	
-			</body>
-		</html>
-		
+                </p>    
+            </body>
+        </html>
+        
       _HTML_STRING_
       if ( hash )
         send_response_hash(init_response(status,"Server error",body))
@@ -200,47 +211,23 @@ module Rho
   
   # Generic configuration class which accepts hashes with unique keys
   class RhoConfig
+    
     @@sources = {}
-    @@start_path = '/'
-    @@options_path = '/'
-    @@rhobundle_zip_url = nil
-    @@rhobundle_zip_pwd = nil
+    @@config = {'start_path' => '/app', 
+                'options_path' => '/app/Settings'}
     
     class << self
-      def sources
-        @@sources
+      def method_missing(name, *args)
+        varname = name.to_s.sub(/=/,'')
+        @@config[varname]
       end
       
-      def options_path
-        @@options_path
-      end
-            
-      def options_path=(path=nil)
-        @@options_path = path if path
-      end
-      
-      def start_path
-        @@start_path
-      end
-            
-      def start_path=(path=nil)
-        @@start_path = path if path
-      end
-      
-      def rhobundle_zip_url
-        @@rhobundle_zip_url
-      end
-            
-      def rhobundle_zip_url=(url=nil)
-        @@rhobundle_zip_url = url
+      def sources
+        @@sources
       end
       
-      def rhobundle_zip_pwd
-        @@rhobundle_zip_pwd
-      end
-            
-      def rhobundle_zip_pwd=(pwd=nil)
-        @@rhobundle_zip_pwd = pwd
+      def config
+        @@config
       end
       
       def add_source(modelname, new_source=nil)