rhodes 3.4.2 → 3.5.1.12

data/rakefile.rb

@@ -62,6 +62,7 @@ load File.join(pwd, 'platform/iphone/rbuild/iphone.rake')
 load File.join(pwd, 'platform/wm/build/wm.rake')
 load File.join(pwd, 'platform/linux/tasks/linux.rake')
 load File.join(pwd, 'platform/wp7/build/wp.rake')
+load File.join(pwd, 'platform/wp8/build/wp.rake')
 load File.join(pwd, 'platform/symbian/build/symbian.rake')
 load File.join(pwd, 'platform/osx/build/osx.rake')
 
@@ -94,7 +95,7 @@ namespace "framework" do
 end
 
 
-$application_build_configs_keys = ['security_token', 'encrypt_database', 'android_title', 'iphone_db_in_approot', 'iphone_set_approot', 'iphone_userpath_in_approot', "motorola_license", "motorola_license_company"]
+$application_build_configs_keys = ['security_token', 'encrypt_database', 'android_title', 'iphone_db_in_approot', 'iphone_set_approot', 'iphone_userpath_in_approot', "motorola_license", "motorola_license_company","name"]
 
 def make_application_build_config_header_file
   f = StringIO.new("", "w+")      
@@ -217,6 +218,7 @@ end
 
 def update_rhoprofiler_java_file
     use_profiler = $app_config['profiler'] || ($app_config[$current_platform] && $app_config[$current_platform]['profiler'])
+    use_profiler = use_profiler && use_profiler.to_i() != 0 ? true : false
     
     content = ""
     File.open( File.join( $startdir, "platform/bb/RubyVM/src/com/rho/RhoProfiler.java" ), 'rb' ){ |f| content = f.read() }
@@ -237,6 +239,7 @@ end
 
 def update_rhodefs_header_file
     use_profiler = $app_config['profiler'] || ($app_config[$current_platform] && $app_config[$current_platform]['profiler'])
+    use_profiler = use_profiler && use_profiler.to_i() != 0 ? true : false
     
     content = ""
     File.open( File.join( $startdir, "platform/shared/common/RhoDefs.h" ), 'rb' ){ |f| content = f.read() }
@@ -378,6 +381,20 @@ namespace "config" do
         end
     end
 
+    # add rawsensors extension for rhoelements app
+    if $current_platform == "iphone" || $current_platform == "android"
+        if $app_config["app_type"] == 'rhoelements'
+            if !$app_config['extensions'].index('rhoelementsext')
+                $app_config["extensions"] += ["rawsensors"] unless $app_config['extensions'].index('rawsensors')
+                $app_config["extensions"] += ["audiocapture"] unless $app_config['extensions'].index('audiocapture')
+            end
+        end
+    end
+    if $app_config['extensions'].index('rhoelementsext')
+        $app_config["extensions"].delete("rawsensors")
+        $app_config["extensions"].delete("audiocapture")
+    end
+
     $hidden_app = $app_config["hidden_app"].nil?() ? "0" : $app_config["hidden_app"]
     
     #application build configs
@@ -404,6 +421,14 @@ namespace "config" do
         #$app_config['extensions'].delete('nfc')
         $rhoelements_features += "- NFC extension\n"
     end
+    if $app_config['extensions'].index('rawsensors')
+        #$app_config['extensions'].delete('rawsensors')
+        $rhoelements_features += "- Raw Sensors\n"
+    end
+    if $app_config['extensions'].index('audiocapture')
+        #$app_config['extensions'].delete('audiocapture')
+        $rhoelements_features += "- Audio Capture\n"
+    end
     
     if $current_platform == "wm"
         $rhoelements_features += "- Windows Mobile/Windows CE platform support\n"
@@ -426,6 +451,10 @@ namespace "config" do
         $rhoelements_features += "- Motorola WebKit Browser\n"                
     end
 
+    if $app_config['extensions'].index('rho-javascript')
+        $rhoelements_features += "- Javascript API for device capabilities\n"                
+    end
+
     if File.exist?(File.join($app_path, "license.yml"))
         license_config = Jake.config(File.open(File.join($app_path, "license.yml")))    
     
@@ -462,6 +491,15 @@ namespace "config" do
             if $app_config['extensions'].index('nfc')
                 $app_config['extensions'].delete('nfc')
             end
+            if $app_config['extensions'].index('rawsensors')
+                $app_config['extensions'].delete('rawsensors')
+            end
+            if $app_config['extensions'].index('audiocapture')
+                $app_config['extensions'].delete('audiocapture')
+            end
+            if $app_config['extensions'].index('rho-javascript')
+                $app_config['extensions'].delete('rho-javascript')
+            end
             
             if $application_build_configs['encrypt_database'] && $application_build_configs['encrypt_database'].to_s == '1'
                 $application_build_configs.delete('encrypt_database')
@@ -598,8 +636,18 @@ def add_extension(path,dest)
   start = pwd
   chdir path if File.directory?(path)
 
-  Dir.glob("*").each { |f| cp_r f,dest unless f =~ /^ext(\/|(\.yml)?$)/ }
+  Dir.glob("*").each do |f| 
+    cp_r f,dest unless f =~ /^ext(\/|(\.yml)?$)/ || f =~ /^app/  || f =~ /^public/
+  end  
 
+  if $current_platform == "bb"
+    cp_r 'app', File.join( dest, "apps/app" ) if File.exist? 'app'
+    cp_r 'public', File.join( dest, "apps/public" ) if File.exist? 'public'
+  else
+    cp_r 'app', File.join( File.dirname(dest), "apps/app" ) if File.exist? 'app'
+    cp_r 'public', File.join( File.dirname(dest), "apps/public" ) if File.exist? 'public'
+  end
+  
   chdir start
 end
 
@@ -622,13 +670,10 @@ def init_extensions(startdir, dest)
       end
     end    
     
-    puts '1'
-
     if extpath.nil?
       begin
         $rhodes_extensions = nil
         require extname
-        puts '1-2'
         if $rhodes_extensions
             extpath = $rhodes_extensions[0]
             $app_config["extpaths"] << extpath
@@ -819,7 +864,13 @@ def common_bundle_start(startdir, dest)
   start = pwd
   chdir rhodeslib
 
-  Dir.glob("*").each { |f| cp_r f,dest, :preserve => true }
+  Dir.glob("*").each { |f|
+    if f.to_s == "autocomplete"
+      next
+    end
+          
+    cp_r f,dest, :preserve => true 
+  }
 
   chdir dest
   Dir.glob("**/rhodes-framework.rb").each {|f| rm f}
@@ -876,7 +927,7 @@ def common_bundle_start(startdir, dest)
 
   replace_platform = $config['platform']
   replace_platform = "bb6" if $bb6
-  replace_platform = "wm" if replace_platform == 'win32'
+  #replace_platform = "wm" if replace_platform == 'win32'
 
   [File.join($srcdir,'apps'), ($current_platform == "bb" ? File.join($srcdir,'res') : File.join($srcdir,'lib/res'))].each do |folder|
       chdir folder
@@ -888,7 +939,8 @@ def common_bundle_start(startdir, dest)
       end
       
       Dir.glob("**/*.wm.*").each { |f| rm f }
-	    Dir.glob("**/*.wp7.*").each { |f| rm f }
+	  Dir.glob("**/*.wp7.*").each { |f| rm f }
+	  Dir.glob("**/*.wp8.*").each { |f| rm f }
       Dir.glob("**/*.iphone.*").each { |f| rm f }
       Dir.glob("**/*.bb.*").each { |f| rm f }
       Dir.glob("**/*.bb6.*").each { |f| rm f }
@@ -912,7 +964,7 @@ def process_exclude_folders
 
   exclude_platform = $config['platform']
   exclude_platform = "bb6" if $bb6
-  exclude_platform = "wm" if exclude_platform == 'win32'
+  #exclude_platform = "wm" if exclude_platform == 'win32'
 
   if $app_config["excludedirs"]
       excl += $app_config["excludedirs"]['all'] if $app_config["excludedirs"]['all']

data/res/generators/rhogen.rb

@@ -101,6 +101,42 @@ module Rhogen
       file.source = 'app/loading.png'
       file.destination = "#{name}/app/loading.png"
     end
+
+    file :loadingpng5 do |file|
+      file.source = 'app/loading-568h@2x.png'
+      file.destination = "#{name}/app/loading-568h@2x.png"
+    end
+
+    file :loadingpngl do |file|
+      file.source = 'app/loading-Landscape.png'
+      file.destination = "#{name}/app/loading-Landscape.png"
+    end
+
+    file :loadingpngll do |file|
+      file.source = 'app/loading-LandscapeLeft.png'
+      file.destination = "#{name}/app/loading-LandscapeLeft.png"
+    end
+
+    file :loadingpnglr do |file|
+      file.source = 'app/loading-LandscapeRight.png'
+      file.destination = "#{name}/app/loading-LandscapeRight.png"
+    end
+
+    file :loadingpngp do |file|
+      file.source = 'app/loading-Portrait.png'
+      file.destination = "#{name}/app/loading-Portrait.png"
+    end
+
+    file :loadingpngpud do |file|
+      file.source = 'app/loading-PortraitUpsideDown.png'
+      file.destination = "#{name}/app/loading-PortraitUpsideDown.png"
+    end
+
+    file :loadingpngx do |file|
+      file.source = 'app/loading@2x.png'
+      file.destination = "#{name}/app/loading@2x.png"
+    end
+
     
     directory :helpers do |directory|
       directory.source = 'app/helpers'

data/res/generators/templates/application/public/css/android.css

@@ -166,7 +166,7 @@ li.ui-btn-up-c {
 */
 }
 .ui-btn-hover-c a.ui-link-inherit {
-	color: 					#000;
+	color: 					#555;
 }
 .ui-btn-down-c {
     border: 1px solid 		#000;

data/res/generators/templates/application/rhoconfig.txt

@@ -83,4 +83,6 @@ syncserver = '<%=syncserver%>'
 # hides forward button and animates back button transition
 jqtouch_mode=1
 
-splash_screen='zoom'
+splash_screen='zoom'
+
+use_bb_full_browser=6

data/res/generators/templates/model/model.rb

@@ -6,5 +6,5 @@ class <%= class_name %>
   # Uncomment the following line to enable sync with <%= class_name %>.
   # enable :sync
 
-  #add model specifc code here
+  #add model specific code here
 end

data/res/libs/motorolalicence/android/MotorolaLicence.h

@@ -4,7 +4,8 @@ extern "C" {
 
 
 // return 1 if correct
-int  MotorolaLicence_check(const char* company, const char* licence);
+int  MotorolaLicence_check(const char* company, const char* licence, const char *appName);
+//int  MotorolaLicence_check(const char* company, const char* licence);
 
 
 

data/res/libs/motorolalicence/iphone/MotorolaLicence.h

@@ -4,7 +4,8 @@ extern "C" {
 
 
 // return 1 if correct
-int  MotorolaLicence_check(const char* company, const char* licence);
+int  MotorolaLicence_check(const char* company, const char* licence, const char* appName);
+//int  MotorolaLicence_check(const char* company, const char* licence);
 
 
 

data/spec/autocomplete_generator/Rakefile

@@ -0,0 +1,37 @@
+require 'yaml'
+
+unless File.exists? "build.yml"
+  puts "Cannot find build.yml"
+  exit 1
+end
+
+
+$app_config = YAML::load_file("build.yml")
+$app_path = File.expand_path(File.dirname(__FILE__))
+
+if ENV["RHO_HOME"].nil?
+  if $app_config["sdk"] 
+    rakefilepath = "#{$app_config["sdk"]}/Rakefile"
+  else
+    begin
+      rakefilepath = `get-rhodes-info --rhodes-path`.chomp
+      rakefilepath  = File.join(rakefilepath, "Rakefile")
+    rescue
+      rakefilepath  = ""	
+    end
+  end  
+else
+  rakefilepath = "#{ENV["RHO_HOME"]}/Rakefile"
+end
+
+unless File.exists? rakefilepath
+  puts "\nCannot find your Rhodes gem or source path: #{rakefilepath}"
+  puts "\nIf you have the sdk on your path or have installed the gem this"
+  puts "can be resolved by running 'set-rhodes-sdk'"
+  puts "\nYou can also set this manually by modifying your build.yml or"
+  puts "setting the environment variable RHO_HOME"
+  exit 1
+end
+
+load rakefilepath
+

data/spec/autocomplete_generator/app/Generator/controller.rb

@@ -0,0 +1,40 @@
+require 'rho'
+require 'rho/rhocontroller'
+require 'rho/rhoerror'
+require 'helpers/browser_helper'
+require 'openssl'
+require 'openssl/digest'
+require 'json'
+require 'digest'
+require 'digest/md5'
+require 'digest/sha1'
+require 'rho/rhoevent.rb'
+require 'time'
+require 'rho/rhocontact'
+require 'rho/rhobluetooth'
+require 'rho/rhotoolbar'
+require 'rho/rhotabbar'
+
+require 'generator/generator'
+      
+class GeneratorController < Rho::RhoController
+  include BrowserHelper
+  
+  def index
+    render
+  end
+
+  def test
+    render :action => :start
+
+    moduleFile = File.new(File.join(Rho::RhoApplication::get_base_app_path(), "test.rb") , "w+")
+    moduleFile.puts "def aaa\nend"
+    moduleFile.close
+  end
+
+  def start
+    render :action => :start
+    generate    
+  end
+
+end

data/spec/autocomplete_generator/app/Generator/generator.rb

@@ -0,0 +1,236 @@
+$rbExt = ".rb"
+
+def undecorateConstantName(name)
+  name = name.to_s
+  name = name[0, name.size]
+  return name
+end
+
+def printTitleInfo(file)
+  if file.nil?
+    return
+  end 
+
+  file.puts " "
+  file.puts "#"
+  file.puts "# It is auto-generated content."
+  file.puts "# Do not do required for this file in your application."
+  file.puts "#"
+  file.puts " "
+end
+
+def decoratePattern(pattern, level, name, params)
+  if params.nil?
+    return decorateOffset(level, pattern + name.to_s + "\n") + decorateOffset(level, "end") + decorateOffset(level, "")
+  else    
+    paramsDeclaration = String.new
+    params.each { |param| 
+      paramsDeclaration += param.to_s 
+      paramsDeclaration += ","
+    }
+
+    if !paramsDeclaration.empty?
+      paramsDeclaration = paramsDeclaration[0..-2]
+      funcDef = decorateOffset(level, pattern + name.to_s + "(" + paramsDeclaration + ")\n")
+    else
+      funcDef = decorateOffset(level, pattern + name.to_s + "\n")
+    end
+
+    return funcDef + decorateOffset(level, "end") + decorateOffset(level, "")
+  end
+end
+
+def decorateInstanceMethod(level, name, params)
+  decoratePattern("def ", level, name, params)
+end
+
+def decorateMethod(level, name, params)
+  decoratePattern("def self.", level, name, params)
+end
+
+def decorateOffset(columnNum, printLine)
+  return "  " * columnNum  + printLine
+end
+
+def prepareUserDefinedSubclass(constNames)
+  autoGenerateConsts  = [ "Instance", "Class", "Base", "Object", "BasicObject", "Kernel", 
+	"NilClass", "NIL", "Data", "TrueClass", "TRUE", "FalseClass", "FALSE", "Encoding", "Comparable", "Enumerable", 
+	"String", "Symbol", "Exception", "SystemExit", "SignalException", "Interrupt", "StandardError", 
+	"TypeError", "ArgumentError", "IndexError", "KeyError", "RangeError", "ScriptError", "SyntaxError", 
+	"LoadError", "NotImplementedError", "NameError", "NoMethodError", "RuntimeError", 
+	"SecurityError", "NoMemoryError", "EncodingError", "SystemCallError", "Errno", "ZeroDivisionError", 
+	"FloatDomainError", "Numeric", "Integer", "Fixnum", "Float", "Bignum", "Array", "Hash", 
+	"ENV", "Struct", "RegexpError", "Regexp", "MatchData", "Marshal", "Range", "IOError", "EOFError", "IO", 
+	"STDIN", "STDOUT", "STDERR", "ARGF", "FileTest", "Random", "Signal", 
+	"Process", "Proc", "LocalJumpError", "SystemStackError", "Method", "UnboundMethod", "Binding", 
+        "Math", "GC", "ObjectSpace", "Enumerator", "StopIteration", "RubyVM", "TOPLEVEL_BINDING", 
+	"ThreadGroup", "Mutex", "ThreadError", "Fiber", "FiberError", "Rational", "Complex", "RUBY_VERSION", 
+	"RUBY_RELEASE_DATE", "RUBY_PLATFORM", "RUBY_PATCHLEVEL", "RUBY_REVISION", "RUBY_DESCRIPTION", 
+	"RUBY_COPYRIGHT", "RUBY_ENGINE", "ARGV", "Gem", "RbConfig", "Config", "CROSS_COMPILING", "Module",
+        "TMP_RUBY_PREFIX", "RHO_FRAMEWORK" ]
+
+  constNames.delete_if{ |item| autoGenerateConsts.include?(undecorateConstantName(item)) }
+  return constNames
+end
+
+$recursiveLevel = 2
+
+def printClassInfo(cls, baseClass, level, moduleFile)
+
+  if level >= $recursiveLevel
+    return
+  end
+
+  begin
+    if baseClass.nil?
+      puts cls.to_s
+      clsObj = Object.const_get(undecorateConstantName(cls))
+    else
+      puts baseClass.to_s + ":" + cls.to_s
+      clsObj = baseClass.const_get(undecorateConstantName(cls))
+    end
+
+    if clsObj.nil?
+      return
+    end
+  rescue
+    p 'wrong name - ' + baseClass.to_s + undecorateConstantName(cls)
+    return
+  end
+
+  begin
+    p '1-' + clsObj.class.to_s + " - " + cls.to_s
+  rescue
+    p 'extception 1'
+  end
+
+  begin
+    case clsObj.class.to_s
+      when "String"
+        puts cls.to_s + ' - String const' 
+        if clsObj == "\\"
+          moduleFile.puts decorateOffset(level, cls.to_s + " = \"\\\\\"")
+        else
+          moduleFile.puts decorateOffset(level, cls.to_s + " = \"" + clsObj + "\"")
+        end
+        moduleFile.puts ''
+        return
+      when "Integer"
+        puts cls.to_s + ' - Integer const' 
+        moduleFile.puts decorateOffset(level, cls.to_s + " = " + clsObj.to_s)
+        moduleFile.puts ''
+        return
+      when "Fixnum"
+        puts cls.to_s + ' - Fixnum const' 
+        moduleFile.puts decorateOffset(level, cls.to_s + " = " + clsObj.to_s)
+        moduleFile.puts ''
+        return
+      when "Hash"
+        puts cls.to_s + ' - Hash const' 
+        moduleFile.puts decorateOffset(level, cls.to_s + " = " + "{}")
+        moduleFile.puts ''
+        return
+      when "Array"
+        puts cls.to_s + ' - Array const' 
+        moduleFile.puts decorateOffset(level, cls.to_s + " = " + "[]")
+        moduleFile.puts ''
+        return
+      when "Mutex"
+        puts cls.to_s + ' - Mutex const' 
+        return
+      when "FalseClass"
+        puts cls.to_s + ' - FalseClass const' 
+        moduleFile.puts decorateOffset(level, cls.to_s + " = " + "false")
+        moduleFile.puts ''
+        return
+      when "TrueClass"
+        puts cls.to_s + ' - TrueClass const' 
+        moduleFile.puts decorateOffset(level, cls.to_s + " = " + "true")
+        moduleFile.puts ''
+        return
+      when "Complex"
+        puts cls.to_s + ' - Complex const' 
+        moduleFile.puts decorateOffset(level, cls.to_s + " = " + "1")
+        moduleFile.puts ''
+        return
+      when "Float"
+        puts cls.to_s + ' - Float const' 
+        moduleFile.puts decorateOffset(level, cls.to_s + " = " + clsObj.to_s)
+        moduleFile.puts ''
+        return
+      else
+        moduleFile.puts decorateOffset(level, clsObj.class.to_s.downcase + " " + cls.to_s)
+
+        if !clsObj.constants.nil?
+          p '2-' + clsObj.constants.to_s
+    
+          subConstants = prepareUserDefinedSubclass(clsObj.constants)
+
+          subConstants.each { |constant|
+          printClassInfo(constant, clsObj, level + 1, moduleFile)
+        }
+        end
+    end
+
+  rescue
+    p 'extception 2'
+  end
+  
+
+  begin
+    if !clsObj.methods(false).nil?
+      p '3-' + clsObj.methods(false).to_s
+
+      methods = clsObj.methods(false)
+
+      methods.each { |method|  
+          p '3.1- ' + method.to_s + " - " + clsObj.method(method.to_s).parameters.to_s #map(&:last).map(&:to_s).to_s
+          moduleFile.puts decorateMethod(level + 1, method, clsObj.method(method.to_s).parameters.map(&:last).map(&:to_s))
+          p '3.2- '
+      }
+    end
+  rescue
+    p 'extception 3'
+  end
+
+  begin
+    if !clsObj.instance_methods.nil?
+      p '4-' + clsObj.instance_methods(false).to_s
+
+      instance_methods = clsObj.instance_methods(false)
+
+      instance_methods.each { |method|      
+        p '4.1- ' + method.to_s + " - " + clsObj.instance_method(method.to_s).parameters.to_s #map(&:last).map(&:to_s).to_s
+        moduleFile.puts decorateInstanceMethod(level + 1, method, clsObj.instance_method(method.to_s).parameters.map(&:last).map(&:to_s))
+        p '4.2- '
+      }
+    end
+  rescue
+    p 'extception 4'
+  end
+
+  moduleFile.puts decorateOffset(level, "end")
+  moduleFile.puts ''
+end
+
+def generate
+  t1 = Thread.new do
+    base = Array.new
+    base << Module.constants
+    base = base[0]
+
+    puts '***********************************************'
+
+    classes = prepareUserDefinedSubclass(base)
+    p classes
+
+    classes.each { |cls|
+      puts cls    
+      moduleFile = File.new(cls.to_s + $rbExt , "w+")
+
+      printTitleInfo(moduleFile)
+      printClassInfo(cls, nil, 0, moduleFile)
+      moduleFile.close
+    }
+  end
+end