rhodes 3.2.0.beta.4 → 3.2.0.beta.5

data/lib/extensions/uri/uri/http.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Akira Yamada <akira@ruby-lang.org>
 # License:: You can redistribute it and/or modify it under the same term as Ruby.
-# Revision:: $Id: http.rb 11708 2007-02-12 23:01:19Z shyouhei $
+# Revision:: $Id: http.rb 25189 2009-10-02 12:04:37Z akr $
 #
 
 require 'uri/generic'

data/lib/extensions/uri/uri/https.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Akira Yamada <akira@ruby-lang.org>
 # License:: You can redistribute it and/or modify it under the same term as Ruby.
-# Revision:: $Id: https.rb 11708 2007-02-12 23:01:19Z shyouhei $
+# Revision:: $Id: https.rb 25189 2009-10-02 12:04:37Z akr $
 #
 
 require 'uri/http'

data/lib/extensions/uri/uri/ldap.rb

@@ -7,7 +7,7 @@
 # License:: 
 #   URI::LDAP is copyrighted free software by Takaaki Tateishi and Akira Yamada.
 #   You can redistribute it and/or modify it under the same term as Ruby.
-# Revision:: $Id: ldap.rb 11708 2007-02-12 23:01:19Z shyouhei $
+# Revision:: $Id: ldap.rb 25189 2009-10-02 12:04:37Z akr $
 #
 
 require 'uri/generic'

data/lib/extensions/uri/uri/mailto.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Akira Yamada <akira@ruby-lang.org>
 # License:: You can redistribute it and/or modify it under the same term as Ruby.
-# Revision:: $Id: mailto.rb 19495 2008-09-23 18:16:08Z drbrain $
+# Revision:: $Id: mailto.rb 27831 2010-05-16 11:35:59Z yugui $
 #
 
 require 'uri/generic'
@@ -38,7 +38,7 @@ module URI
     # hvalue     =  *urlc
     # header     =  hname "=" hvalue
     HEADER_PATTERN = "(?:[^?=&]*=[^?=&]*)".freeze
-    HEADER_REGEXP  = Regexp.new(HEADER_PATTERN, 'N').freeze
+    HEADER_REGEXP  = Regexp.new(HEADER_PATTERN).freeze
     # headers    =  "?" header *( "&" header )
     # to         =  #mailbox
     # mailtoURL  =  "mailto:" [ to ] [ headers ]
@@ -159,7 +159,7 @@ module URI
       return true unless v
       return true if v.size == 0
 
-      if @parser.regexp[:OPAQUE] !~ v || /\A#{MAILBOX_PATTERN}*\z/o !~ v
+      if parser.regexp[:OPAQUE] !~ v || /\A#{MAILBOX_PATTERN}*\z/o !~ v
         raise InvalidComponentError,
           "bad component(expected opaque component): #{v}"
       end
@@ -183,7 +183,7 @@ module URI
       return true unless v
       return true if v.size == 0
 
-      if @parser.regexp[:OPAQUE] !~ v || 
+      if parser.regexp[:OPAQUE] !~ v ||
           /\A(#{HEADER_PATTERN}(?:\&#{HEADER_PATTERN})*)\z/o !~ v
         raise InvalidComponentError,
           "bad component(expected opaque component): #{v}"
@@ -239,18 +239,18 @@ module URI
     #   # => "To: ruby-list@ruby-lang.org\nSubject: subscribe\nCc: myaddr\n\n\n"
     #
     def to_mailtext
-      to = @parser.unescape(@to)
+      to = parser.unescape(@to)
       head = ''
       body = ''
       @headers.each do |x|
         case x[0]
         when 'body'
-          body = @parser.unescape(x[1])
+          body = parser.unescape(x[1])
         when 'to'
-          to << ', ' + @parser.unescape(x[1])
+          to << ', ' + parser.unescape(x[1])
         else
-          head << @parser.unescape(x[0]).capitalize + ': ' +
-            @parser.unescape(x[1])  + "\n"
+          head << parser.unescape(x[0]).capitalize + ': ' +
+            parser.unescape(x[1])  + "\n"
         end
       end
 

data/lib/framework/rho/rhoviewhelpers.rb

@@ -142,8 +142,9 @@ module Rho
       amurl << '/' << application.to_s << '/' if application
       amurl << model.to_s
 
-      if action.nil? or ( !defined?(RHO_WP7) && action == 'create') or action == 'index'  
-        amurl << query << fragment 
+      is_bb6 = System::get_property('platform') == 'Blackberry' && (System::get_property('os_version').split('.')[0].to_i >= 6)
+      if action.nil? or ( !defined?(RHO_WP7) && !is_bb6 && action == 'create' ) or action == 'index'
+        amurl << query << fragment
       else
         amurl << '/' << (id.nil? ? action : id + '/' + action) << query << fragment          
       end

data/lib/framework/rholang/localization_simplified.rb

@@ -31,10 +31,12 @@ module LocalizationSimplified
     def self.init_current_locale
         return if @@cur_locale
         
-        @@cur_locale = System::get_locale().downcase
+        @@cur_locale = System::get_locale()
+        @@cur_locale = @@cur_locale.downcase if @@cur_locale
         @@cur_locale = 'en' unless @@cur_locale
-        @@cur_country = System::get_property("country").downcase
-
+        @@cur_country = System::get_property("country")
+        @@cur_country = @@cur_country.downcase if @@cur_country
+        
         puts "Current locale: #{@@cur_locale}; Country code: #{@@cur_country}"
                 
     end

data/platform/android/Rhodes/src/com/rhomobile/rhodes/Logger.java

@@ -26,6 +26,10 @@
 
 package com.rhomobile.rhodes;
 
+import java.io.CharArrayWriter;
+import java.io.PrintWriter;
+import java.io.Writer;
+
 public class Logger {
 
 	// Errors
@@ -40,7 +44,16 @@ public class Logger {
 	public native static void T(String tag, String msg);
 	
 	public static void E(String tag, Throwable e) {
-		E(tag, e.getMessage());
+	    Writer bufWriter = new CharArrayWriter(256);
+	    PrintWriter writer = new PrintWriter(bufWriter);
+	    e.printStackTrace(writer);
+
+	    if (writer.checkError()) {
+	        E(tag, e.getMessage());
+	        E("Logger", "Cannot print stack trace");
+	    }
+
+		E(tag, bufWriter.toString());
 	}
 	
 	public static void W(String tag, Throwable e) {

data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java

@@ -194,7 +194,7 @@ public class ImageCapture extends BaseActivity implements SurfaceHolder.Callback
 			
 		}
 		catch (Exception e) {
-			Logger.E(TAG, e.getMessage());
+			Logger.E(TAG, e);
 			finish();
 		}
 	}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCaptureCallback.java

@@ -76,7 +76,6 @@ public class ImageCaptureCallback implements PictureCallback {
 
 		} catch (Exception e) {
 			Logger.E(TAG, e);
-			e.printStackTrace();
 		}
 	}
 	

data/platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.java

@@ -54,7 +54,9 @@ public class RhoFileApi {
 	
 	private static AssetManager am;
 	private static String root;
-	
+    private static final String DB_FILES_FOLDER = "db/db-files";
+    private static final String TMP_FOLDER = "tmp";
+
 	private static native void nativeInitPath(String rootPath, String sqliteJournalsPath, String apkPath);
 	private static native void nativeInit();
 	private static native void updateStatTable(String path, String type, long size, long mtime);
@@ -117,13 +119,13 @@ public class RhoFileApi {
 		Log.d(TAG, "App root path: " + root);
 		Log.d(TAG, "Sqlite journals path: " + sqliteJournals);
 		
-		File f = new File(root);
+		File f = new File(getRootPath());
 		f.mkdirs();
-		f = new File(f, "db/db-files");
+		f = new File(getDbFilesPath());
 		f.mkdirs();
 		f = new File(sqliteJournals);
 		f.mkdirs();
-		f = new File(root, "tmp");
+		f = new File(getTempPath());
 		f.mkdirs();
 		
 		String apkPath = sourceDir;
@@ -131,7 +133,12 @@ public class RhoFileApi {
 		nativeInitPath(root, sqliteJournals, apkPath);
 		return root;
 	}
-	
+
+    public static String getRootPath() { return root; }
+    public static String getDbFilesUriPath() { return DB_FILES_FOLDER; }
+    public static String getDbFilesPath() { return new File(getRootPath(), DB_FILES_FOLDER).getAbsolutePath(); }
+    public static String getTempPath() { return new File(getRootPath(), TMP_FOLDER).getAbsolutePath(); }
+
 	public static void init(Context ctx) throws IOException
 	{
 		nativeInit();

data/platform/android/build/android.rake

@@ -528,12 +528,12 @@ namespace "config" do
     $storealias = $config["android"]["production"]["alias"] if $storealias.nil? and !$config["android"].nil? and !$config["android"]["production"].nil?
     $storealias = "rhomobile.keystore" if $storealias.nil?
 
-    $app_config["capabilities"] = [] if $app_config["capabilities"].nil?
-    $app_config["capabilities"] = [] unless $app_config["capabilities"].is_a? Array
-    if $app_config["android"] and $app_config["android"]["capabilities"]
-      $app_config["capabilities"] += $app_config["android"]["capabilities"]
-      $app_config["android"]["capabilities"] = nil
-    end
+#    $app_config["capabilities"] = [] if $app_config["capabilities"].nil?
+#    $app_config["capabilities"] = [] unless $app_config["capabilities"].is_a? Array
+#    if $app_config["android"] and $app_config["android"]["capabilities"]
+#      $app_config["capabilities"] += $app_config["android"]["capabilities"]
+#      $app_config["android"]["capabilities"] = nil
+#    end
     $app_config["capabilities"] += ANDROID_CAPS_ALWAYS_ENABLED
     $app_config["capabilities"].map! { |cap| cap.is_a?(String) ? cap : nil }.delete_if { |cap| cap.nil? }
     $use_google_addon_api = true unless $app_config["capabilities"].index("push").nil?
@@ -1775,7 +1775,7 @@ namespace "run" do
         load_app_and_run
     end
 
-    task :rhosimulator => "config:common" do    
+    task :rhosimulator => ["config:set_android_platform","config:common"] do    
     
         $emuversion = $app_config["android"]["version"] unless $app_config["android"].nil?
         $emuversion = $config["android"]["version"] if $emuversion.nil? and !$config["android"].nil?

data/platform/iphone/Classes/AppManager/AppManager.m

@@ -210,9 +210,9 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
 
 	NSString *filePathNew = [bundleRoot stringByAppendingPathComponent:@"name"];
 	NSString *filePathOld = [rhoRoot stringByAppendingPathComponent:@"name"];
-#ifndef RHO_DONT_COPY_ON_START
+//#ifndef RHO_DONT_COPY_ON_START
     BOOL hasOldName = [fileManager fileExistsAtPath:filePathOld];
-#endif
+//#endif
     BOOL nameChanged = ![self isContentsEqual:fileManager first:filePathNew second:filePathOld];
 
     BOOL contentChanged;
@@ -260,7 +260,7 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
         [fileManager removeItemAtPath:dst error:&error];
         [fileManager createSymbolicLinkAtPath:dst withDestinationPath:src error:&error];
         
-        NSString *dirs[] = {@"apps", @"db"};
+        NSString *dirs[] = {@"apps"};
         for (int i = 0, lim = sizeof(dirs)/sizeof(dirs[0]); i < lim; ++i) {
             // Create directory
             src = [bundleRoot stringByAppendingPathComponent:dirs[i]];
@@ -275,9 +275,9 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
             for (int i = 0, lim = [subelements count]; i < lim; ++i) {
                 NSString *child = [subelements objectAtIndex:i];
                 NSString *fchild = [src stringByAppendingPathComponent:child];
-                NSLog(@"src: %@", fchild);
+                NSLog(@" .. src: %@", fchild);
                 NSString *target = [dst stringByAppendingPathComponent:child];
-                NSLog(@"dst: %@", target);
+                NSLog(@" .. dst: %@", target);
                 [fileManager removeItemAtPath:target error:&error];
                 if ([child isEqualToString:@"rhoconfig.txt"]) {
                     [fileManager setDelegate:nil];
@@ -295,13 +295,25 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
         if (myDelegate != nil) {
             [myDelegate release];
         }
+        // copy "db"
+        NSString *copy_dirs[] = {@"db"};
+        for (int i = 0, lim = sizeof(copy_dirs)/sizeof(copy_dirs[0]); i < lim; ++i) {
+            BOOL remove = nameChanged;
+            if ([copy_dirs[i] isEqualToString:@"db"] && !hasOldName)
+                remove = NO;
+            NSString *src = [bundleRoot stringByAppendingPathComponent:copy_dirs[i]];
+            NSLog(@"copy src: %@", src);
+            NSString *dst = [rhoRoot stringByAppendingPathComponent:copy_dirs[i]];
+            NSLog(@"copy dst: %@", dst);
+            [self copyFromMainBundle:fileManager fromPath:src toPath:dst remove:remove];
+        }
         // Finally, copy "hash" and "name" files
         NSString *items[] = {@"hash", @"name"};
         for (int i = 0, lim = sizeof(items)/sizeof(items[0]); i < lim; ++i) {
             NSString *src = [bundleRoot stringByAppendingPathComponent:items[i]];
-            NSLog(@"src: %@", src);
+            NSLog(@"copy src: %@", src);
             NSString *dst = [rhoRoot stringByAppendingPathComponent:items[i]];
-            NSLog(@"dst: %@", dst);
+            NSLog(@"copy dst: %@", dst);
             [fileManager removeItemAtPath:dst error:&error];
             [fileManager copyItemAtPath:src toPath:dst error:&error];
         }

data/platform/iphone/rbuild/iphone.rake

@@ -751,7 +751,7 @@ namespace "run" do
       exit $failed.to_i
     end
 
-    task :rhosimulator => "config:common" do    
+    task :rhosimulator => ["config:set_iphone_platform","config:common"] do    
     
         $rhosim_config = "platform='iphone'\r\n"
         

data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Created by Qt/QMake</string>
+	<string>RhoSimulator 3.2.0.beta.5, Copyright 2010-2011 Rhomobile, Inc.</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>

data/platform/osx/build/osx.rake

@@ -31,9 +31,7 @@ namespace "config" do
   end
   
   task :osx => [:set_osx_platform, "config:common"] do
-    $qmake = "qmake"
     $make = "make"
-    $macdeployqt = "macdeployqt"
     $name_tool = "install_name_tool"
     $move = "mv"
     $remove = "rm"
@@ -44,10 +42,32 @@ end
 
 namespace "build" do
   namespace "osx" do
-    task :rhosimulator => ["config:set_osx_platform", "config:osx"] do
+    task :rhosimulator => ["config:set_osx_platform", "config:osx", "config:qt"] do
         app_path = File.join( $build_dir, 'RhoSimulator/RhoSimulator.app' )
         puts Jake.run($remove,['-R', app_path ])
 
+        File.open(File.join($startdir, 'platform/shared/qt/rhodes/resources/Info.plist'), "wb") do |fversion|
+            fversion.write( %{<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+	<key>CFBundleIconFile</key>
+	<string>@ICON@</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleGetInfoString</key>
+	<string>RhoSimulator #{$rhodes_version}, Copyright 2010-2011 Rhomobile, Inc.</string>
+	<key>CFBundleSignature</key>
+	<string>@TYPEINFO@</string>
+	<key>CFBundleExecutable</key>
+	<string>@EXECUTABLE@</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.rhomobile.@EXECUTABLE@</string>
+</dict>
+</plist>
+})
+        end
+
         chdir $qt_project_dir
         args = ['-o', 'Makefile', '-r', '-spec', 'macx-g++', 'RhoSimulator.pro']
         puts Jake.run($qmake,args)
@@ -61,6 +81,7 @@ namespace "build" do
 
         puts Jake.run($macdeployqt, [app_path])
 
+        # Last version of macdeployqt correctly handles these paths, so in the future this code can be removed:
         exe_path = File.join( app_path, 'Contents/MacOS/RhoSimulator' )
         frm_path = File.join( app_path, 'Contents/Frameworks/' )
         fw_path = ['@executable_path/../Frameworks/', '.framework/Versions/Current', '.framework/Versions/4']
@@ -71,6 +92,7 @@ namespace "build" do
           args = [ '-change', fw_path[0] + lib + fw_path[1] + '/' + lib, fw_path[0] + lib + fw_path[2] + '/' + lib, exe_path]
           puts Jake.run($name_tool,args)
         }
+        # end of the depricated macdeployqt fix code
 
         puts Jake.run($remove,['-R', File.join(frm_path, 'QtDeclarative.framework' )])
         puts Jake.run($remove,['-R', File.join(frm_path, 'QtOpenGL.framework' )])

data/platform/shared/common/AutoPointer.h

@@ -70,7 +70,7 @@ template <typename TYPE, typename PTRTYPE=TYPE*>
 class CAutoPtr : public CBaseAutoPointer<PTRTYPE>
 {
 public:
-    CAutoPtr( PTRTYPE ptr ){ Set(ptr); }
+    CAutoPtr( PTRTYPE ptr ){   CBaseAutoPointer<PTRTYPE>::Set(ptr); }
     CAutoPtr(){}
     ~CAutoPtr(){ CBaseAutoPointer<PTRTYPE>::Close(); }
 

data/platform/shared/common/RhoStd.h

@@ -107,7 +107,7 @@ public:
 
     void addElement(const Type& item)
     {
-        push_back(item);
+        std::vector<Type>::push_back(item);
     }
 
     boolean isEmpty()
@@ -131,7 +131,7 @@ public:
         {
             if ( *it == item )
             {
-                it = erase(it);    
+                it = std::vector<Type>::erase(it);    
             }else
                 it++;
         }
@@ -158,8 +158,8 @@ public:
         Vector<Type>::clear();
     }
 
-    typename std::vector<Type>::reference elementAt(typename std::vector<Type>::size_type i){ return at(i);}
-    typename std::vector<Type>::const_reference elementAt(typename std::vector<Type>::size_type i) const{ return at(i); }
+    typename std::vector<Type>::reference elementAt(typename std::vector<Type>::size_type i){ return std::vector<Type>::at(i);}
+    typename std::vector<Type>::const_reference elementAt(typename std::vector<Type>::size_type i) const{ return std::vector<Type>::at(i); }
 };
 
 template<class Type>
@@ -183,7 +183,7 @@ public:
             if ( *it == item )
             {
                 delete *it;
-                it = erase(it);    
+                it = std::vector<Type>::erase(it);    
             }else
                 it++;
         }
@@ -204,7 +204,7 @@ public:
 
     void add(const Type& item)
     {
-        addElement(item);
+        VectorPtr<Type>::addElement(item);
     }
 
     void addToFront(const Type& item)
@@ -247,7 +247,7 @@ public:
 
     void remove(const TKEY& key)
     {
-        erase(key);
+        std::map<TKEY,TVALUE>::erase(key);
     }
 
     TVALUE get(const TKEY& key)
@@ -260,7 +260,7 @@ public:
 
     boolean containsKey(const TKEY& key)
     {
-        return find(key) != std::map<TKEY,TVALUE>::end();
+        return std::map<TKEY,TVALUE>::find(key) != std::map<TKEY,TVALUE>::end();
     }
 };
 
@@ -282,11 +282,11 @@ public:
 
     void remove(const TKEY& key)
     {
-        typename std::map<TKEY,TVALUE>::iterator it = find(key);
+        typename std::map<TKEY,TVALUE>::iterator it = Hashtable<TKEY,TVALUE>::find(key);
         if ( it != Hashtable<TKEY,TVALUE>::end() )
             delete it->second;
 
-        erase(key);
+        Hashtable<TKEY,TVALUE>::erase(key);
     }
 
 };