rhodes 2.4.1 → 3.0.0.beta.1

data/lib/extensions/nfc/ext/nfc/platform/android/AndroidManifest.xml

@@ -7,7 +7,7 @@
     
     <uses-sdk android:minSdkVersion="9" />
     
-    <uses-feature android:name="android.hardware.nfc" android:required="true" />
+    <uses-feature android:name="android.hardware.nfc" android:required="false" />
 
     <application>
         

data/lib/extensions/nfc/ext/nfc/platform/android/src/com/nfc/Nfc.java

@@ -7,6 +7,7 @@ import android.content.Intent;
 import android.nfc.NdefMessage;
 import android.nfc.NdefRecord;
 import android.nfc.NfcAdapter;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.util.Log;
@@ -38,8 +39,19 @@ public class Nfc  extends BroadcastReceiver {
 	
 	
 	public static int isSupported() {
-		//NfcAdapter da = NfcAdapter.getDefaultAdapter(RhodesService.getContext());
-		NfcAdapter da = NfcAdapter.getDefaultAdapter();
+		NfcAdapter da = null;
+		try {
+			int sdkVersion = Integer.parseInt(Build.VERSION.SDK);
+			if (sdkVersion >= Build.VERSION_CODES.GINGERBREAD_MR1) {
+				da = NfcAdapter.getDefaultAdapter(RhodesService.getContext());
+			}
+			else if (sdkVersion >= Build.VERSION_CODES.GINGERBREAD) {
+				da = NfcAdapter.getDefaultAdapter();
+			}
+		}
+		catch (Exception e) {
+			// nothing
+		}
 		if (da == null) {
 			return 0;
 		}

data/lib/extensions/timeout/timeout.rb

@@ -0,0 +1,114 @@
+# = timeout.rb
+#
+# execution timeout
+#
+# = Synopsis
+#
+#   require 'timeout'
+#   status = Timeout::timeout(5) {
+#     # Something that should be interrupted if it takes too much time...
+#   }
+#
+# = Description
+#
+# A way of performing a potentially long-running operation in a thread, and terminating
+# it's execution if it hasn't finished by a fixed amount of time.
+#
+# Previous versions of timeout didn't provide use a module for namespace. This version
+# provides both Timeout.timeout, and a backwards-compatible #timeout.
+#
+# = Copyright
+#
+# Copyright:: (C) 2000  Network Applied Communication Laboratory, Inc.
+# Copyright:: (C) 2000  Information-technology Promotion Agency, Japan
+
+module Timeout
+  # Raised by Timeout#timeout when the block times out.
+  class Error < RuntimeError
+  end
+  class ExitException < ::Exception # :nodoc:
+  end
+
+  THIS_FILE = /\A#{Regexp.quote(__FILE__)}:/o
+  CALLER_OFFSET = ((c = caller[0]) && THIS_FILE =~ c) ? 1 : 0
+
+  # Executes the method's block.  If the block execution terminates before
+  # +sec+ seconds has passed, it returns the result value of the block.
+  # If not, it terminates the execution and raises +exception+ (which defaults
+  # to Timeout::Error).
+  #
+  # Note that this is both a method of module Timeout, so you can 'include Timeout'
+  # into your classes so they have a #timeout method, as well as a module method,
+  # so you can call it directly as Timeout.timeout().
+  def timeout(sec, klass = nil)   #:yield: +sec+
+    return yield(sec) if sec == nil or sec.zero?
+    exception = klass || Class.new(ExitException)
+    @is_stoptimeout = false
+    begin
+      x = Thread.current
+      y = Thread.start {
+        sleep sec
+        
+        if !@is_stoptimeout
+            x.raise exception, "execution expired" if x.alive?
+        end    
+      }
+      return yield(sec)
+    rescue exception => e
+      rej = /\A#{Regexp.quote(__FILE__)}:#{__LINE__-4}\z/o
+      (bt = e.backtrace).reject! {|m| rej =~ m}
+      level = -caller(CALLER_OFFSET).size
+      while THIS_FILE =~ bt[level]
+        bt.delete_at(level)
+        level += 1
+      end
+      raise if klass            # if exception class is specified, it
+                                # would be expected outside.
+      raise Error, e.message, e.backtrace
+    ensure
+      if y and y.alive?
+        @is_stoptimeout = true
+      
+        y.kill 
+        y.join # make sure y is dead.
+      end
+    end
+  end
+
+  module_function :timeout
+end
+
+# Identical to:
+#
+#   Timeout::timeout(n, e, &block).
+#
+# Defined for backwards compatibility with earlier versions of timeout.rb, see
+# Timeout#timeout.
+def timeout(n, e = nil, &block)
+  Timeout::timeout(n, e, &block)
+end
+
+# Another name for Timeout::Error, defined for backwards compatibility with
+# earlier versions of timeout.rb.
+TimeoutError = Timeout::Error
+
+if __FILE__ == $0
+  p timeout(5) {
+    45
+  }
+  p timeout(5, TimeoutError) {
+    45
+  }
+  p timeout(nil) {
+    54
+  }
+  p timeout(0) {
+    54
+  }
+  p timeout(5) {
+    loop {
+      p 10
+      sleep 1
+    }
+  }
+end

data/lib/framework/rho/render.rb

@@ -5,7 +5,10 @@ require 'rho/rho'
 module Rho
   class RhoController
     begin
-      if Rho::file_exist? File.join(__rhoGetCurrentDir(), 'lib/rhodes_translator.iseq')
+      is_translator_exist = true
+      is_translator_exist = Rho::file_exist?( File.join(__rhoGetCurrentDir(), 'lib/rhodes_translator' + RHO_RB_EXT) ) if !defined?( RHODES_EMULATOR )
+          
+      if is_translator_exist
         require 'rhodes_translator'
         include RhodesTranslator::Translator
         include RhodesTranslator::Binding
@@ -24,14 +27,8 @@ module Rho
 
     def self.renderfile(filename, req = {}, res = {})
       res = ""
-	  if defined?(RHO_WP7)
-		if File.extname(filename) == '.iseq'
-			filename = filename[0,filename.length-5] + '.rb'
-		end
-	  end
-
-	  render_ext = defined?(RHO_WP7) ? '.rb' : '.iseq'
-      if File.extname(filename) == render_ext
+
+      if filename.end_with?(RHO_ERB_EXT)
         res = (RhoController.new).inst_render_index(filename, req, res)
       else
         res = IO.read(filename)
@@ -53,7 +50,7 @@ module Rho
       @content = eval_compiled_file(filename, getBinding() )
       if !xhr?
           rho_info 'index layout' 
-          layout = File.dirname(filename) + "/layout_erb.iseq"
+          layout = File.dirname(filename) + "/layout" + RHO_ERB_EXT
           @content = eval_compiled_file(layout, getBinding() ) if Rho::file_exist?(layout)
 	  else
           if @request["headers"]["Transition-Enabled"] == "true"
@@ -114,14 +111,15 @@ module Rho
         options[:layout] = false
       else
         if options[:file].nil? or !options[:file].is_a?(String)
-          if Rho::file_exist?(@request[:modelpath]+action.to_s+'_erb.iseq')
-            @content = eval_compiled_file(@request[:modelpath]+action+'_erb.iseq', getBinding() )
+          fname = @request[:modelpath]+action.to_s+RHO_ERB_EXT
+          if Rho::file_exist?(fname)
+            @content = eval_compiled_file(fname, getBinding() )
           else
             @content = ""
           end
         else
           options[:file] = options[:file].gsub(/\.erb$/,"").gsub(/^\/app/,"")
-          @content = eval_compiled_file(RhoApplication::get_app_path(@request['application'])+options[:file]+'_erb.iseq', getBinding() )
+          @content = eval_compiled_file(RhoApplication::get_app_path(@request['application'])+options[:file]+RHO_ERB_EXT, getBinding() )
           options[:layout] = false if options[:layout].nil?
         end
       end
@@ -136,7 +134,7 @@ module Rho
       end
 
       if options[:layout] != false
-        layoutfile = RhoApplication::get_app_path(@request['application']) + options[:layout].to_s + "_erb.iseq"
+        layoutfile = RhoApplication::get_app_path(@request['application']) + options[:layout].to_s + RHO_ERB_EXT
         @content = eval_compiled_file(layoutfile, binding ) if Rho::file_exist?(layoutfile)
         rho_info 'Layout file: ' + layoutfile + '. Content size: ' + @content.length.to_s
       end
@@ -228,7 +226,7 @@ module Rho
         end
         modelpath = @request[:modelpath]
         modelpath = Rho::RhoFSConnector.get_model_path("app",model) if model
-        content = eval_compiled_file(modelpath+'_' + partial_name.to_s+'_erb.iseq', locals.get_binding )
+        content = eval_compiled_file(modelpath+'_' + partial_name.to_s+RHO_ERB_EXT, locals.get_binding )
       else
         #xruby issue - https://www.pivotaltracker.com/story/show/3454121
         content = render_partial_collection(options,partial_name)
@@ -272,7 +270,7 @@ module Rho
     def add_objectnotify(arg)
       return unless arg
 
-      if arg.is_a? (Array)
+      if arg.is_a?(Array)
         arg.each do |item|
           @@m_arObjectNotify.push(strip_braces(item.object))
           @@m_arSrcIDNotify.push(item.source_id)

data/lib/framework/rho/rho.rb

@@ -35,7 +35,7 @@ module Rho
       else
         load_models_from_file(Rho::RhoFSConnector::get_app_manifest_filename)
       end
-      
+
       # Initialize application and sources
       @@rho_framework = self
       @db_partitions = {}
@@ -179,12 +179,28 @@ module Rho
       end
       APPLICATIONS[appname]
     end
-
+    
+if defined?( RHODES_EMULATOR )
     def load_models_from_file(app_manifest_filename=nil)
-      File.open(app_manifest_filename).each do |line|
+        require 'rhoappmanifest'
+        
+        fappManifest = Rho::AppManifest.enumerate_models(Rho::RhoFSConnector.get_app_path('app').chop)
+        _load_models_from_file(fappManifest)
+        fappManifest.close
+    end
+else
+    def load_models_from_file(app_manifest_filename=nil)
+        f = File.open(app_manifest_filename)
+        _load_models_from_file(f)    
+        f.close
+    end
+end
+
+    def _load_models_from_file(f)    
+      f.each do |line|
         str = line.chomp
         if str != nil and str.length > 0 
-            #puts "model file: #{str}"
+            puts "model file: #{str}"
             model_name = File.basename(File.dirname(str))
 
             Rho::RhoConfig::add_source(model_name, {:loaded => false, :file_path => str})
@@ -447,7 +463,7 @@ module Rho
                 
                 associationsSrc = find_src_byname(uniq_sources, src_name)
                 if !associationsSrc
-                    puts ( "Error: belongs_to '#{source['name']}' : source name '#{src_name}' does not exist."  )
+                    puts "Error: belongs_to '#{source['name']}' : source name '#{src_name}' does not exist."
                     next
                 end
                 
@@ -584,13 +600,21 @@ module Rho
         strCreate = "" unless strCreate
         if schema_attr['property']
             arCols = schema_attr['property']
-            arCols = arCols
-            strCols = ""
-            arCols.each do |col, type|
-                strCols += ',' if strCols.length() > 0
-                strCols += "\"#{col}\" varchar default NULL"
-                #TODO: support column type
-            end
+            strCols = arCols.collect do |col, type|
+                "\"#{col}\" " + 
+                case type[0]
+                    when :integer
+                        'integer'
+                    when :float
+                        'float'
+                    when :date
+                        'integer'
+                    when :time
+                        'integer'
+                    else
+                        'varchar'
+                end + " default null"
+            end.join(',')
 
             strCols += ',' if strCols.length() > 0
             strCols += "\"object\" varchar(255) PRIMARY KEY"
@@ -882,10 +906,10 @@ module Rho
       
       err_page = nil
       if exception && exception.is_a?(::Rhom::RecordNotFound)
-        err_page = RhoApplication::get_app_path(APPNAME) + 'E400_erb.iseq'
+        err_page = RhoApplication::get_app_path(APPNAME) + 'E400' + RHO_ERB_EXT
         err_page = nil unless ::Rho::file_exist?(err_page)
       elsif exception
-        err_page = RhoApplication::get_app_path(APPNAME) + 'E500_erb.iseq'
+        err_page = RhoApplication::get_app_path(APPNAME) + 'E500' + RHO_ERB_EXT
         err_page = nil unless ::Rho::file_exist?(err_page)
       end
 

data/lib/framework/rho/rhoapplication.rb

@@ -155,7 +155,7 @@ module Rho
 	  undercase.slice!(0) if undercase.start_with?('_')
 	  #TODO: WP7 - for some reason it added _ at the start
 	  	
-      if Rho::file_exist?(  req[:modelpath]+ undercase +'.iseq' )
+      if Rho::file_exist?(  req[:modelpath]+ undercase +RHO_RB_EXT )
         require req['model'] + '/' + undercase #req[:modelpath]+ undercase
       else
         require req['model'] + '/controller' #req[:modelpath]+'controller'

data/lib/framework/rho/rhocontroller.rb

@@ -65,7 +65,7 @@ module Rho
         res = send req['action'].nil? ? default_action : req['action']
       else
         called_action = @request['action'].nil? ? default_action : @request['action']
-        unless Rho::file_exist?(@request[:modelpath]+called_action.to_s+'_erb.iseq')
+        unless Rho::file_exist?(@request[:modelpath]+called_action.to_s+RHO_ERB_EXT)
           rho_error( "Action '#{act}' does not exist in controller or has private access."  )
           res = render :string => "<font size=\"+4\"><h2>404 Not Found.</h2>The action <i>#{called_action}</i> does not have a view or a controller</font>"
         end
@@ -87,8 +87,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?
+      test2 = /XMLHttpRequest/i.match(@request['headers']['X-Requested-With'])
+      not test2.nil?
     end
     alias xhr? :xml_http_request?
 

data/lib/framework/rho/rhofsconnector.rb

@@ -5,39 +5,51 @@ module Rho
     class << self
 	
       def get_app_path(appname)
-        File.join(__rhoGetCurrentDir(), 'apps/'+appname+'/')
+        File.join(__rhoGetCurrentDir(), RHO_APPS_DIR+appname+'/')
       end
       
       def get_base_app_path
-        File.join(__rhoGetCurrentDir(), 'apps/')
+        File.join(__rhoGetCurrentDir(), RHO_APPS_DIR)
       end
       
       def get_app_manifest_filename
-        File.join(__rhoGetCurrentDir(), 'apps/app_manifest.txt')
+        File.join(__rhoGetCurrentDir(), RHO_APPS_DIR + 'app_manifest.txt')
       end
       
       def get_rhoconfig_filename
-        File.join(__rhoGetCurrentDir(), 'apps/rhoconfig.txt')
+        File.join(__rhoGetCurrentDir(), RHO_APPS_DIR + 'rhoconfig.txt')
       end
 
       def get_model_path(appname, modelname)
-        File.join(__rhoGetCurrentDir(), 'apps/'+appname+'/'+modelname+'/')
+        File.join(__rhoGetCurrentDir(), RHO_APPS_DIR+appname+'/'+modelname+'/')
       end
 
       def get_db_fullpathname(postfix)
+if defined?( RHODES_EMULATOR )                  
+          File.join(__rhoGetCurrentDir(), RHO_EMULATOR_DIR + '/db/syncdb' + postfix + '.sqlite')
+else
           File.join(__rhoGetCurrentDir(), 'db/syncdb' + postfix + '.sqlite')
+end          
       end
 
       def get_blob_folder()
+if defined?( RHODES_EMULATOR )                        
+        File.join(__rhoGetCurrentDir(), RHO_EMULATOR_DIR + '/db/db-files')
+else
         File.join(__rhoGetCurrentDir(), 'db/db-files')
+end        
       end
 
       def get_public_folder()
-        File.join(__rhoGetCurrentDir(), 'apps/public')
+        File.join(__rhoGetCurrentDir(), RHO_APPS_DIR + 'public')
       end
 
       def get_blob_path(relative_path)
         cur_dir = __rhoGetCurrentDir()
+if defined?( RHODES_EMULATOR )
+        cur_dir = File.join(cur_dir, RHO_EMULATOR_DIR)
+end
+        
         if cur_dir && cur_dir.length()>0
             File.join(cur_dir, relative_path)
         else

data/lib/framework/rho/rhoviewhelpers.rb

@@ -102,7 +102,7 @@ module Rho
       model = params[:controller] || params[:model] || @request['model'] 
       action = params[:action].nil? ? nil : params[:action].to_s
       id = params[:id].nil? ? nil : params[:id].to_s
-      id = "{#{id}}" if id and not ( id =~ /^{/ and id =~ /}$/ )
+      id = "{#{id}}" if id and not( id =~ /^{/ and id =~ /}$/ )
 
       if params[:query_s]
         query = params[:query_s]

data/lib/framework/rhoappmanifest.rb

@@ -0,0 +1,44 @@
+require 'find'
+
+module Rho
+
+  class AppManifest
+
+        def self.enumerate_models(src_dir)
+          
+          fappManifest = StringIO.new("", "w+")
+
+          Find.find(src_dir) do |path|
+
+            strDir = File.dirname(path)
+            next unless src_dir == File.dirname(strDir) #one level only
+
+            if File.basename(path) == "config.rb"
+                puts "******ERROR enumerating models***********"
+                puts "Model definition has changed and doesn't use config.rb anymore: '#{path}' "
+                puts "You should replace config.rb with <model_name>.rb file as described: "
+                puts "http://wiki.rhomobile.com/index.php/Rhom#Rhom_Models"
+                puts "*****************************************"
+                exit 1
+            end
+            
+            fname = File.dirname(path)
+            fname = File.basename(fname)
+            modelname = fname.split(/(?=[A-Z])/).map{|w| w.downcase}.join("_")
+            fname = modelname + ".rb"
+          
+            if File.basename(path) == fname
+
+              relPath = path[src_dir.length+1, File.dirname(path).length-1]   #relative path
+              relPath = relPath[0, relPath.length-3] #remove .rb extension and app
+              relPath = File.join(File.dirname(relPath), modelname )
+              fappManifest.puts( relPath )
+
+            end
+          end
+
+          fappManifest.rewind
+          fappManifest
+        end
+    end        
+end