rhodes 3.2.0.beta.2 → 3.2.0.beta.4

data/CHANGELOG

@@ -4,6 +4,7 @@
 * Support native JQueryMobile css-styles
 * Support latest Android NDK
 * Support Offline map on Android
+* RhoSimulator for OSX Lion
 
 ## 3.1
 * Symbian support(Beta)

data/Manifest.txt

@@ -2139,6 +2139,7 @@ platform/shared/curl/include/curl/types.h
 platform/shared/curl/lib/amigaos.c
 platform/shared/curl/lib/arpa_telnet.h
 platform/shared/curl/lib/base64.c
+platform/shared/curl/lib/config-mac.h
 platform/shared/curl/lib/config-symbian.h
 platform/shared/curl/lib/config-win32.h
 platform/shared/curl/lib/config-win32ce.h
@@ -2382,6 +2383,8 @@ platform/shared/qt/rhodes/impl/RhoThreadImpl.cpp
 platform/shared/qt/rhodes/impl/RhoThreadImpl.h
 platform/shared/qt/rhodes/impl/RingtoneManagerImpl.cpp
 platform/shared/qt/rhodes/impl/SignatureImpl.cpp
+platform/shared/qt/rhodes/impl/SSLImpl.cpp
+platform/shared/qt/rhodes/impl/SSLImpl.h
 platform/shared/qt/rhodes/impl/SystemImpl.cpp
 platform/shared/qt/rhodes/impl/WebViewImpl.cpp
 platform/shared/qt/rhodes/main.cpp

data/doc/build.txt

@@ -13,7 +13,7 @@ You should check to see that the required software in installed on your computer
 
 If you planning to modify or [extend](extensions) Rhodes, you will need the Rhodes source code. It is distributed under MIT license. You don't need it if you are not planning to modify/extend Rhodes.
 
-Rhodes source code is available on github.com. You will need Git to get it. If you used [Instant Rhodes](install#install-on-windows) you probably already have Git installed on your system. Otherwise, load it from [here](http://git-scm.com).
+Rhodes source code is available on github.com. You will need Git to get it. If you used [RhoStudio for Windows](http://rhomobile.com/rhostudio-windows) you probably already have Git installed on your system. Otherwise, load it from [here](http://git-scm.com).
 
 To clone Rhodes to your local computer, execute git clone from the command line:
 	

data/doc/device-caps.txt

@@ -115,6 +115,10 @@ Set application icon badge (number) - only for iPhone. set badge to 0 (zero) for
 	:::ruby
 	System.set_application_icon_badge(badge_number)
 
+Switch locale at runtime:
+	:::ruby
+    System::set_locale('es') #set current locale to Spanish
+
 ### Sample
 See layout.erb of [System API Sample application](http://github.com/rhomobile/rhodes-system-api-samples/tree/master/app/layout.erb)  for some of the examples of how to use System class. There is also [system test](http://github.com/rhomobile/rhodes-system-api-samples/tree/master/app/SystemTest/controller.rb) which demonstrate System class usage.
 

data/doc/extensions.txt

@@ -57,6 +57,9 @@ And use this string in the view:
 		<li><%= Localization::Views[:greeting] %></li>
 	</ul> 
 
+To switch locale at runtime use:
+	:::ruby
+    System::set_locale('es') #set current locale to Spanish
 #### Details:
 
 All non-ascii symbols should be utf-8 encoded

data/doc/install.txt

@@ -1,7 +1,8 @@
 # Install Rhodes
 
-## Instant Rhodes (Windows)
-The easiest way to install Rhodes on Windows is to use the [Instant Rhodes installer](http://rhomobile.com/instant-rhodes). This will install Ruby, Rubygems, Redis, Rhodes and Rhosync gems and dependencies.
+## Windows
+
+If you're running Windows, download the latest [RhoStudio for Windows](http://rhomobile.com/rhostudio-windows). This installs the [Ruby stack](http://www.ruby-lang.org/en/), [Redis](http://redis.io/), [RhoConnect](/rhoconnect/introduction) and [Rhodes](/rhodes/introduction).
 
 Once the installer has completed, and you have installed the Java Development Kit, you can skip to the [Setup Rhodes section](#setup-rhodes).
 

data/lib/framework/date.rb

@@ -8,6 +8,8 @@ end
 require 'rholang/localization_simplified'
 # Modification of ruby constants
 class Date
+  alias_method :old_strftime, :strftime
+
   #FIXME as these are defined as Ruby constants, they can not be overwritten
   MONTHNAMES         = LocalizationSimplified::DateHelper::Monthnames
   ABBR_MONTHNAMES    = LocalizationSimplified::DateHelper::AbbrMonthnames
@@ -18,6 +20,17 @@ class Date
   #, :long_ordinal => lambda { |date| date.strftime("%B #{date.day.ordinalize}, %Y") }, # => "April 25th, 2007" :rfc822 => "%e %b %Y"
   DATE_FORMATS.merge!(LocalizationSimplified::DateHelper::DateFormats)
 
+  def strftime(date)
+  
+    if LocalizationSimplified::get_cur_locale() == 'en'
+        return old_strftime(date)
+    end
+    
+    tmpdate=date.dup
+    LocalizationSimplified::localize_strftime(tmpdate, self)
+    old_strftime(tmpdate)
+  end
+
   def to_formatted_s(type)
     strftime(DATE_FORMATS[type])
   end

data/lib/framework/dateME.rb

@@ -106,6 +106,8 @@ end
 
 class Date
 
+  SECONDS_IN_DAY         = Rational(1, 86400) # :nodoc:
+
   def self.today
     Date.new( Time.now )
   end

data/lib/framework/rho/rhoapplication.rb

@@ -31,6 +31,8 @@ require 'rho/rhomsg'
 require 'rho/rhotabbar'
 require 'rho/rhotoolbar'
 
+::System::set_locale(nil, nil)
+
 module Rho
   class RhoApplication
   	attr_accessor :default_menu
@@ -44,7 +46,7 @@ module Rho
       {:action => :home}, {:action => :refresh}, {:action => :options} ]
     	
     def initialize
-      LocalizationSimplified.requre_loc(Rho::RhoFSConnector::get_app_path('app') + 'lang/lang_',true)
+      #LocalizationSimplified.requre_loc(Rho::RhoFSConnector::get_app_path('app') + 'lang/lang_',true)
       
       unless @rhom
         @rhom = Rhom::Rhom.new

data/lib/framework/rho/rhoerror.rb

@@ -57,5 +57,5 @@ module Rho
   end # RhoError
 end # Rho
 
-require 'rholang/localization_simplified'
-LocalizationSimplified.requre_loc('rholang/rhoerror_',false)
+#require 'rholang/localization_simplified'
+#LocalizationSimplified.requre_loc('rholang/rhoerror_',false)

data/lib/framework/rho/rhomsg.rb

@@ -32,5 +32,5 @@ module Rho
   end # RhoMessages
 end # Rho
 
-require 'rholang/localization_simplified'
-LocalizationSimplified.requre_loc('rholang/rhomsg_',false)
+#require 'rholang/localization_simplified'
+#LocalizationSimplified.requre_loc('rholang/rhomsg_',false)

data/lib/framework/rholang/localization_simplified.rb

@@ -6,7 +6,8 @@
 
 module LocalizationSimplified
   @@ignore = "\xFF\xFF\xFF\xFF" # %% == Literal "%" character
-  @@cur_locale = 'en'
+  @@cur_locale = nil #'en'
+  @@cur_country = nil #'en'
   # substitute all daynames and monthnames with localized names
   # from RUtils plugin
   def self.localize_strftime(date='%d.%m.%Y', time='')
@@ -22,12 +23,24 @@ module LocalizationSimplified
     @@cur_locale  
   end
   
-    def self.requre_loc(file,check_exist)
-        curLocale = System::get_locale().downcase
-        curCountry = System::get_property("country").downcase
+  def self.set_cur_locale(loc, country)
+    @@cur_locale = loc
+    @@cur_country = country  
+  end
+  
+    def self.init_current_locale
+        return if @@cur_locale
+        
+        @@cur_locale = System::get_locale().downcase
+        @@cur_locale = 'en' unless @@cur_locale
+        @@cur_country = System::get_property("country").downcase
 
-        puts "Current locale: #{curLocale}; Country code: #{curCountry}"
-        @@cur_locale = curLocale
+        puts "Current locale: #{@@cur_locale}; Country code: #{@@cur_country}"
+                
+    end
+    
+    def self.requre_loc(file,check_exist)
+        init_current_locale()
 
         unless check_exist
 if defined?( RHODES_EMULATOR )        
@@ -38,13 +51,15 @@ end
             puts "file: #{file}"
         end
       
-        if curCountry && curCountry.length() > 0 && Rho::file_exist?(file + curLocale + '_' + curCountry + RHO_RB_EXT) 
-            require file + curLocale + '_' + curCountry
-        elsif Rho::file_exist?(file + curLocale + RHO_RB_EXT)
-            require file + curLocale
+      puts "Current locale: #{@@cur_locale}; Country code: #{@@cur_country}"
+      
+        if @@cur_country && @@cur_country.length() > 0 && Rho::file_exist?(file + @@cur_locale + '_' + @@cur_country + RHO_RB_EXT) 
+            require file + @@cur_locale + '_' + @@cur_country
+        elsif Rho::file_exist?(file + @@cur_locale + RHO_RB_EXT)
+            require file + @@cur_locale
         else    
-            puts 'Could not find resources for locale: ' + curLocale.to_s + ";file: #{file}"if curLocale != 'en'
-            if curLocale != 'en' && Rho::file_exist?(file + 'en' + RHO_RB_EXT)
+            puts 'Could not find resources for locale: ' + @@cur_locale.to_s + ";file: #{file}" if @@cur_locale != 'en'
+            if @@cur_locale != 'en' && Rho::file_exist?(file + 'en' + RHO_RB_EXT)
                 puts 'Load english resources.'
                 require file + 'en'
             end    
@@ -53,7 +68,18 @@ end
   
 end
 
-LocalizationSimplified.requre_loc('rholang/lang_',false)
+#LocalizationSimplified.requre_loc('rholang/lang_',false)
+
+module System
+    def self.set_locale(locale_code, country_code = nil)
+        LocalizationSimplified::set_cur_locale(locale_code, country_code)
+        
+        LocalizationSimplified.requre_loc('rholang/lang_',false)
+        LocalizationSimplified.requre_loc(Rho::RhoFSConnector::get_app_path('app') + 'lang/lang_',true)
+        LocalizationSimplified.requre_loc('rholang/rhoerror_',false)
+        LocalizationSimplified.requre_loc('rholang/rhomsg_',false)    
+    end
+end
 
 class Hash
     def reverse_merge(other_hash)

data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyRuntime.java

@@ -98,7 +98,7 @@ public class RubyRuntime
     public static RubyClass EVRecordClass;    
     public static RubyClass GeoLocationClass;
     public static RubyModule AsyncHttpModule;
-    public static RubyClass SystemClass;
+    public static RubyModule SystemClass;
     public static RubyModule JSONClass;
     public static RubyClass CameraClass;
     public static RubyClass RhoBluetoothClass;
@@ -311,7 +311,7 @@ public class RubyRuntime
         EVRecordClass = RubyAPI.defineClass("EVRecord", RubyRuntime.ObjectClass);        
         GeoLocationClass = RubyAPI.defineClass("GeoLocation", RubyRuntime.ObjectClass);
         AsyncHttpModule = rhoModule.defineModule("AsyncHttp");
-		SystemClass = RubyAPI.defineClass("System", RubyRuntime.ObjectClass);
+		SystemClass = RubyAPI.defineModule("System");//, RubyRuntime.ObjectClass);
         JSONClass = rhoModule.defineModule("JSON" );//, RubyRuntime.ObjectClass);
         CameraClass = RubyAPI.defineClass("Camera", RubyRuntime.ObjectClass);
         RhoBluetoothClass = RubyAPI.defineClass("RhoBluetooth", RubyRuntime.ObjectClass);

data/platform/bb/rhodes/src/com/rho/rubyext/System.java

@@ -58,7 +58,7 @@ public class System {
 	
 	private static RhodesApp RHODESAPP(){ return RhodesApp.getInstance(); }
 	
-	public static void initMethods(RubyClass klass){
+	public static void initMethods(RubyModule klass){
 		klass.getSingletonClass().defineMethod( "get_property", new RubyOneArgMethod(){ 
 			protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block )
 			{

data/platform/iphone/Classes/Rhodes.m

@@ -30,7 +30,7 @@
 #import "ParamsWrapper.h"
 
 #include "sync/ClientRegister.h"
-#include "sync/syncthread.h"
+#include "sync/SyncThread.h"
 #include "logging/RhoLogConf.h"
 #include "logging/RhoLog.h"
 #include "common/RhoConf.h"

data/platform/iphone/rhosynclib/rhosynclib.xcodeproj/project.pbxproj

@@ -26,8 +26,8 @@
 		46E9214C0E9BF40A00F14AC8 /* printbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = 46E9213A0E9BF40A00F14AC8 /* printbuf.c */; };
 		46E9214D0E9BF40A00F14AC8 /* printbuf.h in Headers */ = {isa = PBXBuildFile; fileRef = 46E9213B0E9BF40A00F14AC8 /* printbuf.h */; };
 		5C329221112C748F00FD3F13 /* RJSONTokener.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C329220112C748F00FD3F13 /* RJSONTokener.c */; };
-		5C5335AC0FC2F3AB00F268F0 /* syncthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C5335AA0FC2F3AB00F268F0 /* syncthread.cpp */; };
-		5C5335AD0FC2F3AB00F268F0 /* syncthread.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C5335AB0FC2F3AB00F268F0 /* syncthread.h */; };
+		5C5335AC0FC2F3AB00F268F0 /* SyncThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C5335AA0FC2F3AB00F268F0 /* SyncThread.cpp */; };
+		5C5335AD0FC2F3AB00F268F0 /* SyncThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C5335AB0FC2F3AB00F268F0 /* SyncThread.h */; };
 		5C74058A1064AA4900163569 /* DBAttrManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C7405881064AA4900163569 /* DBAttrManager.cpp */; };
 		5C74058B1064AA4900163569 /* DBAttrManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C7405891064AA4900163569 /* DBAttrManager.h */; };
 		5C7405F2106CF7F400163569 /* SyncNotify.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C7405F0106CF7F400163569 /* SyncNotify.cpp */; };
@@ -69,8 +69,8 @@
 		46E9213A0E9BF40A00F14AC8 /* printbuf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = printbuf.c; path = ../../shared/json/printbuf.c; sourceTree = SOURCE_ROOT; };
 		46E9213B0E9BF40A00F14AC8 /* printbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = printbuf.h; path = ../../shared/json/printbuf.h; sourceTree = SOURCE_ROOT; };
 		5C329220112C748F00FD3F13 /* RJSONTokener.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = RJSONTokener.c; sourceTree = "<group>"; };
-		5C5335AA0FC2F3AB00F268F0 /* syncthread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = syncthread.cpp; path = ../../shared/sync/syncthread.cpp; sourceTree = SOURCE_ROOT; };
-		5C5335AB0FC2F3AB00F268F0 /* syncthread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = syncthread.h; path = ../../shared/sync/syncthread.h; sourceTree = SOURCE_ROOT; };
+		5C5335AA0FC2F3AB00F268F0 /* SyncThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SyncThread.cpp; path = ../../shared/sync/SyncThread.cpp; sourceTree = SOURCE_ROOT; };
+		5C5335AB0FC2F3AB00F268F0 /* SyncThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SyncThread.h; path = ../../shared/sync/SyncThread.h; sourceTree = SOURCE_ROOT; };
 		5C7405881064AA4900163569 /* DBAttrManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DBAttrManager.cpp; path = ../../shared/db/DBAttrManager.cpp; sourceTree = SOURCE_ROOT; };
 		5C7405891064AA4900163569 /* DBAttrManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DBAttrManager.h; path = ../../shared/db/DBAttrManager.h; sourceTree = SOURCE_ROOT; };
 		5C7405F0106CF7F400163569 /* SyncNotify.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SyncNotify.cpp; path = ../../shared/sync/SyncNotify.cpp; sourceTree = SOURCE_ROOT; };
@@ -168,8 +168,8 @@
 				5C7405F1106CF7F400163569 /* SyncNotify.h */,
 				5CE294091009D8B7009A75F6 /* ClientRegister.cpp */,
 				5CE2940A1009D8B7009A75F6 /* ClientRegister.h */,
-				5C5335AA0FC2F3AB00F268F0 /* syncthread.cpp */,
-				5C5335AB0FC2F3AB00F268F0 /* syncthread.h */,
+				5C5335AA0FC2F3AB00F268F0 /* SyncThread.cpp */,
+				5C5335AB0FC2F3AB00F268F0 /* SyncThread.h */,
 				5C9817260FBC4F41002597A5 /* SyncEngine.cpp */,
 				5C9817270FBC4F41002597A5 /* SyncEngine.h */,
 				5C9817280FBC4F41002597A5 /* SyncSource.cpp */,
@@ -221,7 +221,7 @@
 				5C98172D0FBC4F41002597A5 /* SyncSource.h in Headers */,
 				5C9817340FBC4F70002597A5 /* DBAdapter.h in Headers */,
 				5C9817360FBC4F70002597A5 /* DBResult.h in Headers */,
-				5C5335AD0FC2F3AB00F268F0 /* syncthread.h in Headers */,
+				5C5335AD0FC2F3AB00F268F0 /* SyncThread.h in Headers */,
 				5CE2940C1009D8B7009A75F6 /* ClientRegister.h in Headers */,
 				5C74058B1064AA4900163569 /* DBAttrManager.h in Headers */,
 				5C7405F3106CF7F400163569 /* SyncNotify.h in Headers */,
@@ -286,7 +286,7 @@
 				5C98172C0FBC4F41002597A5 /* SyncSource.cpp in Sources */,
 				5C9817330FBC4F70002597A5 /* DBAdapter.cpp in Sources */,
 				5C9817350FBC4F70002597A5 /* DBResult.cpp in Sources */,
-				5C5335AC0FC2F3AB00F268F0 /* syncthread.cpp in Sources */,
+				5C5335AC0FC2F3AB00F268F0 /* SyncThread.cpp in Sources */,
 				5CE2940B1009D8B7009A75F6 /* ClientRegister.cpp in Sources */,
 				5C74058A1064AA4900163569 /* DBAttrManager.cpp in Sources */,
 				5C7405F2106CF7F400163569 /* SyncNotify.cpp in Sources */,

data/platform/shared/RhoConnectClient/RhoConnectClient.cpp

@@ -413,6 +413,45 @@ unsigned long rho_connectclient_find_first(const char* szModel, unsigned long ha
     return rhom_find( szModel, hash, 1 );
 }
 
+unsigned long rho_connectclient_findbysql(const char* szModel, const char* szSql, unsigned long arParams )
+{
+    String src_name = szModel;
+
+    IDBResult  res = db::CDBAdapter::getUserDB().executeSQL("SELECT source_id, partition, schema, sync_type from sources WHERE name=?", src_name);
+    if ( res.isEnd())
+    {
+        //TODO: report error - unknown source
+        return 0;
+    }
+
+    int nSrcID = res.getIntByIdx(0);
+    String db_partition = res.getStringByIdx(1);
+    bool isSchemaSrc = res.getStringByIdx(2).length() > 0;
+    db::CDBAdapter& db = db::CDBAdapter::getDB(db_partition.c_str());
+
+    unsigned long items = rho_connectclient_strhasharray_create();
+
+    IDBResult res1 = !arParams ? db.executeSQL(szSql) : db.executeSQLEx( szSql, *((Vector<String>*) arParams) );
+    if ( res1.isEnd() )
+        return items;
+
+    for ( ; !res1.isEnd(); res1.next() )
+    {
+        unsigned long item = rho_connectclient_hash_create();
+
+        for (int i = 0; i < res1.getColCount(); i++ )
+        {
+            if ( !res1.isNullByIdx(i))
+                rho_connectclient_hash_put(item, res1.getColName(i).c_str(), res1.getStringByIdx(i).c_str() );
+        }
+
+        rho_connectclient_strhasharray_add(items, item ); 
+    }
+
+    return items;
+
+}
+
 void rho_connectclient_start_bulkupdate(const char* szModel)
 {
     String src_name = szModel;

data/platform/shared/RhoConnectClient/RhoConnectClient.h

@@ -106,6 +106,8 @@ void rho_connectclient_create_object(const char* szModel, unsigned long hash);
 unsigned long rho_connectclient_find(const char* szModel,const char* szObject );
 unsigned long rho_connectclient_find_first(const char* szModel, unsigned long hashCond );
 unsigned long rho_connectclient_find_all(const char* szModel, unsigned long hashCond );
+unsigned long rho_connectclient_findbysql(const char* szModel, const char* szSql, unsigned long arParams );
+
 void rho_connectclient_save( const char* szModel, unsigned long hash );
 void rho_connectclient_itemdestroy( const char* szModel, unsigned long hash );