rhodes 2.3.0.beta.1 → 2.3.0.beta.2

data/Rakefile

@@ -74,7 +74,7 @@ def make_application_build_config_header_file
 
   f.puts 'static const char* values[] = { ""'
   $application_build_configs.keys.each do |key|
-    f.puts ',"'+$application_build_configs[key]+'"'
+    f.puts ',"'+$application_build_configs[key].to_s+'"'
     count = count + 1
   end
   f.puts '};'

data/doc/device-caps.txt

@@ -866,6 +866,7 @@ NOTE: in order to use it on Android, you need to install Google Add-on API and r
 
 	:::ruby
 	map_params = {
+	     :provider => 'Google',
 	     :settings => {:map_type => "hybrid",:region => [@params['latitude'], @params['longitude'], 0.2, 0.2],
 	                   :zoom_enabled => true,:scroll_enabled => true,:shows_user_location => false,
 	                   :api_key => 'Google Maps API Key'},
@@ -877,6 +878,16 @@ NOTE: in order to use it on Android, you need to install Google Add-on API and r
 	}
 	MapView.create map_params
 
+
+Provider:
+
+There are two providers supported now - 'Google' and 'ESRI'. 'Google supported on iPhone, Android and BB. 'ESRI' supported on iPhone, Android, BB and WM. 
+
+For use ESRI maps in your projects on iPhone:
+
+* Install [http://resources.arcgis.com/content/arcgis-iphone/api  ESRI iOS SDK] - use default folders during installations !
+* Add "esri" to your applications extensions list in build.yml file.
+
 Map settings:
 
 * map_type - widget may display maps of three types: standard, satellite, and hybrid

data/lib/framework/dateME.rb

@@ -11,26 +11,65 @@ class Time
     str    
   end
   
-  def strftime(fmt='%F')
+  def __getPM()
+    strPM = 'AM'
+    nHour = hour();
+    if nHour >= 12
+        strPM = 'PM'
+        nHour = nHour-12 if nHour > 12
+    end
+
+	return strPM, nHour
+  end
 
+  def strftime(fmt='%F')
     if fmt == "%m/%d/%Y, %I:%M%p"
         strRes = "" 
-        strPM = 'AM'
-        nHour = hour();
-        if nHour >= 12
-            strPM = 'PM'
-            nHour = nHour-12 if nHour > 12
-        end
-        
+        strPM, nHour = __getPM()
+
         strRes += __makeTwoDigit(mon()) + '/' + __makeTwoDigit(mday()) + '/' + year().to_s + ', ' + __makeTwoDigit(nHour) + ':' + __makeTwoDigit(min()) + strPM;
         return strRes 
     elsif fmt == "%Y%m%dT%H%M%S.000 GMT"
         strRes = year().to_s() +  __makeTwoDigit(mon()) + __makeTwoDigit(mday()) + "T" + __makeTwoDigit(hour()) + __makeTwoDigit(min()) + __makeTwoDigit(sec()) +
             ".000 GMT"
         
-        return strRes 
+        return strRes
+	elsif fmt == '%a %b %d %Y'		 
+        strRes = LocalizationSimplified::DateHelper::AbbrDaynames[wday()] + ' ' + LocalizationSimplified::DateHelper::AbbrMonthnames[mon()] + ' ' + __makeTwoDigit(mday()) + ' ' + year().to_s()
+		return strRes 
+	elsif fmt == '%d %Y'		 
+        strRes = "Test"
+		return strRes 
+    elsif fmt == '%Y%m%d'
+        strRes = year().to_s() +  __makeTwoDigit(mon()) + __makeTwoDigit(mday())
+		return strRes 
+    elsif fmt == '%a'
+		strRes = LocalizationSimplified::DateHelper::AbbrDaynames[wday()]
+		return strRes 
+    elsif fmt == '%b'
+		strRes = LocalizationSimplified::DateHelper::AbbrMonthnames[mon()]
+		return strRes 
+    elsif fmt == '%d'
+		strRes = __makeTwoDigit(mday())
+		return strRes 
+    elsif fmt == '%Y'
+		strRes = year().to_s()
+		return strRes 
+    elsif fmt == '%M'
+		strRes =  __makeTwoDigit(min())
+		return strRes 
+    elsif fmt == '%H'
+		strRes =  __makeTwoDigit(hour())
+		return strRes 
+    elsif fmt == '%p'
+        strPM, nHour = __getPM()
+		strRes =  strPM
+		return strRes 
+
     end
-    
+
+	#puts "strftime: " + fmt
+
     DateTime.new(self).strftime(fmt)
   end
 
@@ -46,7 +85,9 @@ class Date
     Date.new( Time.strptime(str,fmt) )
   end
 
-  def to_s() format('%.4d-%02d-%02d', year(), mon(), mday()) end # 4p
+  def to_s() 
+	format('%.4d-%02d-%02d', year(), mon(), mday()) 
+  end # 4p
   
   def self.civil(y=-4712, m=1, d=1, sg=2299161)
     Date.new( Time.new(y,m,d) )

data/platform/android/Rhodes/jni/src/callbacks.cpp

@@ -188,7 +188,7 @@ RHO_GLOBAL void rho_sys_run_app(const char *appname, VALUE params)
     jmethodID mid = getJNIClassStaticMethod(env, cls, "runApplication", "(Ljava/lang/String;Ljava/lang/Object;)V");
     if (!mid) return;
     jobject jParams = rho_cast<jobject>(env, params);
-    env->CallStaticVoidMethod(cls, mid, env->NewStringUTF(appname), jParams);
+    env->CallStaticVoidMethod(cls, mid, rho_cast<jhstring>(appname).get(), jParams);
 }
 
 RHO_GLOBAL void rho_sys_open_url(const char *url)
@@ -198,7 +198,7 @@ RHO_GLOBAL void rho_sys_open_url(const char *url)
     if (!cls) return;
     jmethodID mid = getJNIClassStaticMethod(env, cls, "openExternalUrl", "(Ljava/lang/String;)V");
     if (!mid) return;
-    env->CallStaticVoidMethod(cls, mid, env->NewStringUTF(url));
+    env->CallStaticVoidMethod(cls, mid, rho_cast<jhstring>(url).get());
 }
 
 RHO_GLOBAL int rho_sys_is_app_installed(const char *appname)
@@ -208,7 +208,7 @@ RHO_GLOBAL int rho_sys_is_app_installed(const char *appname)
     if (!cls) return 0;
     jmethodID mid = getJNIClassStaticMethod(env, cls, "isAppInstalled", "(Ljava/lang/String;)Z");
     if (!mid) return 0;
-    return (int)env->CallStaticBooleanMethod(cls, mid, env->NewStringUTF(appname));
+    return (int)env->CallStaticBooleanMethod(cls, mid, rho_cast<jhstring>(appname).get());
 }
 
 RHO_GLOBAL void rho_sys_app_install(const char *url)
@@ -218,7 +218,7 @@ RHO_GLOBAL void rho_sys_app_install(const char *url)
     if (!cls) return;
     jmethodID mid = getJNIClassStaticMethod(env, cls, "installApplication", "(Ljava/lang/String;)V");
     if (!mid) return;
-    env->CallStaticVoidMethod(cls, mid, env->NewStringUTF(url));
+    env->CallStaticVoidMethod(cls, mid, rho_cast<jhstring>(url).get());
 }
 
 RHO_GLOBAL void rho_sys_app_uninstall(const char *appname)
@@ -228,5 +228,5 @@ RHO_GLOBAL void rho_sys_app_uninstall(const char *appname)
     if (!cls) return;
     jmethodID mid = getJNIClassStaticMethod(env, cls, "uninstallApplication", "(Ljava/lang/String;)V");
     if (!mid) return;
-    env->CallStaticVoidMethod(cls, mid, env->NewStringUTF(appname));
+    env->CallStaticVoidMethod(cls, mid, rho_cast<jhstring>(appname).get());
 }

data/platform/android/Rhodes/jni/src/event.cpp

@@ -165,7 +165,7 @@ jobject event_cast<jobject, VALUE>(VALUE rEvent)
     RHO_TRACE("eventFromRuby (3)");
     jmethodID mid = getJNIClassMethod(env, clsEvent, "<init>", "(Ljava/lang/String;)V");
     if (!mid) return NULL;
-    jobject jEvent = env->NewObject(clsEvent, mid, env->NewStringUTF(RSTRING_PTR(rId)));
+    jobject jEvent = env->NewObject(clsEvent, mid, rho_cast<jhstring>(RSTRING_PTR(rId)).get());
     if (!jEvent) return NULL;
 
     RHO_TRACE("eventFromRuby (4)");
@@ -173,7 +173,7 @@ jobject event_cast<jobject, VALUE>(VALUE rEvent)
     if (!NIL_P(rTitle))
     {
         Check_Type(rTitle, T_STRING);
-        env->SetObjectField(jEvent, fidTitle, env->NewStringUTF(RSTRING_PTR(rTitle)));
+        env->SetObjectField(jEvent, fidTitle, rho_cast<jhstring>(RSTRING_PTR(rTitle)).get());
     }
 
     RHO_TRACE("eventFromRuby (5)");
@@ -196,7 +196,7 @@ jobject event_cast<jobject, VALUE>(VALUE rEvent)
     if (!NIL_P(rLocation))
     {
         Check_Type(rLocation, T_STRING);
-        env->SetObjectField(jEvent, fidLocation, env->NewStringUTF(RSTRING_PTR(rLocation)));
+        env->SetObjectField(jEvent, fidLocation, rho_cast<jhstring>(RSTRING_PTR(rLocation)).get());
     }
 
     RHO_TRACE("eventFromRuby (9)");
@@ -204,7 +204,7 @@ jobject event_cast<jobject, VALUE>(VALUE rEvent)
     if (!NIL_P(rNotes))
     {
         Check_Type(rNotes, T_STRING);
-        env->SetObjectField(jEvent, fidNotes, env->NewStringUTF(RSTRING_PTR(rNotes)));
+        env->SetObjectField(jEvent, fidNotes, rho_cast<jhstring>(RSTRING_PTR(rNotes)).get());
     }
 
     RHO_TRACE("eventFromRuby (10)");
@@ -212,7 +212,7 @@ jobject event_cast<jobject, VALUE>(VALUE rEvent)
     if (!NIL_P(rPrivacy))
     {
         Check_Type(rPrivacy, T_STRING);
-        env->SetObjectField(jEvent, fidPrivacy, env->NewStringUTF(RSTRING_PTR(rPrivacy)));
+        env->SetObjectField(jEvent, fidPrivacy, rho_cast<jhstring>(RSTRING_PTR(rPrivacy)).get());
     }
 
     RHO_TRACE("eventFromRuby: return");

data/platform/android/build/android.rake

@@ -266,7 +266,7 @@ namespace "config" do
     $shareddir = File.join($androidpath, "..", "shared")
     $srcdir = File.join($bindir, "RhoBundle")
     $targetdir = File.join($bindir, "target")
-    $excludelib = ['**/builtinME.rb','**/ServeME.rb','**/TestServe.rb']
+    $excludelib = ['**/builtinME.rb','**/ServeME.rb','**/dateME.rb','**/rationalME.rb']
     $tmpdir = File.join($bindir, "tmp")
     $resourcedir = File.join($tmpdir, "resource")
     $libs = File.join($androidpath, "Rhodes", "libs")

data/platform/bb/build/bb.rake

@@ -190,13 +190,13 @@ namespace "config" do
 
     $bbver = $app_config["bbver"].to_s
     unless $app_config[$current_platform] && $app_config[$current_platform]["ignore_bb6_suffix"]  && $app_config[$current_platform]['ignore_bb6_suffix'].to_s == '1'
-        $bb6 = true if $bbver[0].to_i >= 6
+        $bb6 = true if $bbver.split('.')[0].to_i >= 6
         
         puts "use bb6 suffix" if $bb6
     end    
     
     use_sqlite = $app_config[$current_platform] && $app_config[$current_platform]['use_sqlite']  && $app_config[$current_platform]['use_sqlite'].to_s == '1'
-    $use_sqlite = $bbver[0].to_i >= 5 && use_sqlite ? true : false
+    $use_sqlite = $bbver.split('.')[0].to_i >= 5 && use_sqlite ? true : false
     puts "$use_sqlite : #{$use_sqlite}"
     
     $builddir = $config["build"]["bbpath"] + "/build"
@@ -1034,7 +1034,7 @@ namespace "run" do
 
     task :stopmdsandsim_ex => ["config:bb"] do
         
-        stopsim if $bbver[0].to_i < 5
+        stopsim if $bbver.split('.')[0].to_i < 5
 
         stopmds
     end  
@@ -1059,7 +1059,7 @@ namespace "run" do
     
     startmds
 
-    if $bbver[0].to_i < 5
+    if $bbver.split('.')[0].to_i < 5
       cp_r File.join($targetdir,"/."), jde + "/simulator"
       startsim 
     elsif !load_to_sim(false)

data/platform/iphone/rbuild/iphone.rake

@@ -252,7 +252,7 @@ namespace "config" do
     $bindir = Jake.get_absolute(iphonepath) + "/bin"
     $srcdir =  $bindir + "/RhoBundle"
     $targetdir = iphonepath + "/target" 
-    $excludelib = ['**/builtinME.rb','**/ServeME.rb','**/TestServe.rb']
+    $excludelib = ['**/builtinME.rb','**/ServeME.rb','**/dateME.rb','**/rationalME.rb']
     $tmpdir =  $bindir +"/tmp"
 
     $devroot = '/Developer' if $devroot.nil?

data/platform/shared/net/HttpServer.cpp

@@ -126,7 +126,8 @@ static bool isknowntype(String const &uri)
         {".png", 4},
         {".bmp", 4},
         {".jpg", 4},
-        {".jpeg", 5}
+        {".jpeg", 5},
+        {".gif", 4}
     };
     
     // Convert uri to lower case

data/platform/shared/shttpd/src/rdispatcher.c

@@ -295,7 +295,7 @@ extern void rho_sync_addobjectnotify_bysrcname(const char* szSrcName, const char
 void* rho_dispatch(struct conn *c, const char* path) {
   RouteRef route;
   
-  if ( _shttpd_match_extension(c->uri,"css,js,html,htm,png,bmp,jpg") )
+  if ( _shttpd_match_extension(c->uri,"css,js,html,htm,png,bmp,jpg,jpeg,gif") )
     return NULL;
 
 /*#ifdef __SYMBIAN32__

data/platform/shared/sync/SyncEngine.cpp

@@ -514,7 +514,7 @@ boolean CSyncEngine::resetClientIDByNet(const String& strClientID)//throws Excep
     //if ( CClientRegister::getInstance() != null )
     //    strBody += CClientRegister::getInstance()->getRegisterBody();
 
-    NetResponse( resp, getNet().pullData(getProtocol().getClientResetUrl(strClientID), this) );
+    NetResponse( resp, m_NetRequestClientID->pullData(getProtocol().getClientResetUrl(strClientID), this) );
 
 
 /*    processServerSources("{\"server_sources\":[{\"name\":\"Product\",\"partition\":\"application\",\"source_id\":\"2\",\"sync_priority\":\"0\","
@@ -552,7 +552,7 @@ String CSyncEngine::requestClientIDByNet()
     //if ( CClientRegister::getInstance() != null )
     //    strBody += CClientRegister::getInstance()->getRegisterBody();
 
-    NetResponse(resp,getNet().pullData(getProtocol().getClientCreateUrl(), this));
+    NetResponse(resp,m_NetRequestClientID->pullData(getProtocol().getClientCreateUrl(), this));
     if ( resp.isOK() && resp.getCharData() != null )
     {
         const char* szData = resp.getCharData();
@@ -812,7 +812,10 @@ void CSyncEngine::login(String name, String password, const CSyncNotification& o
     }
 
    	if ( isStoppedByUser() )
+	{
+		LOG(INFO) + "Login was stopped by application.";
         return;
+	}
 
 	{
 		DBResult( res , getUserDB().executeSQL("SELECT * FROM client_info") );

data/platform/shared/sync/SyncEngine.h

@@ -44,7 +44,7 @@ public:
 
 private:
     VectorPtr<CSyncSource*> m_sources;
-    common::CAutoPtr<net::INetRequest> m_NetRequest;
+    common::CAutoPtr<net::INetRequest> m_NetRequest, m_NetRequestClientID;
     common::CAutoPtr<ISyncProtocol> m_SyncProtocol;
     ESyncState m_syncState;
     String     m_clientID;
@@ -65,6 +65,8 @@ public:
 
     void setFactory(common::IRhoClassFactory* factory){ 
         m_NetRequest = factory->createNetRequest();
+        //clientID may be requested by ClientRegister thread
+        m_NetRequestClientID = factory->createNetRequest();
         m_oSyncNotify.setFactory(factory);
     }
     static CSourceOptions& getSourceOptions(){ return m_oSourceOptions; }

data/platform/shared/sync/SyncNotify.cpp

@@ -548,7 +548,11 @@ int CSyncNotify::getLastSyncObjectCount(int nSrcID)
 void CSyncNotify::callLoginCallback(const CSyncNotification& oNotify, int nErrCode, String strMessage)
 {
 	if ( getSync().isStoppedByUser() )
+	{
+		LOG(INFO) + "Login was stopped by application.";
+
 		return;
+	}
 
 	//try{
     String strBody = "error_code=" + convertToStringA(nErrCode);

data/platform/shared/sync/SyncThread.cpp

@@ -228,6 +228,8 @@ void rho_sync_stop()
 	
 	if (CSyncThread::getSyncEngine().isSyncing() )
 	{
+		LOG(INFO)+"STOP sync in progress.";
+
 		CSyncThread::getSyncEngine().stopSyncByUser();
         CSyncThread::getInstance()->stopWait();
 
@@ -333,9 +335,12 @@ int rho_sync_logged_in()
 
 void rho_sync_logout()
 {
+	LOG(INFO) + "Logout";
+
     rho_sync_stop();
 
 	//CDBAdapter& db = CDBAdapter::getUserDB();
+	LOG(INFO) + "stopSyncByUser";
     CSyncThread::getSyncEngine().stopSyncByUser();
     CSyncThread::getSyncEngine().logout();
 }

data/rakefile.rb

@@ -74,7 +74,7 @@ def make_application_build_config_header_file
 
   f.puts 'static const char* values[] = { ""'
   $application_build_configs.keys.each do |key|
-    f.puts ',"'+$application_build_configs[key]+'"'
+    f.puts ',"'+$application_build_configs[key].to_s+'"'
     count = count + 1
   end
   f.puts '};'

data/rhodes.gemspec

@@ -3,8 +3,8 @@ require "lib/rhodes.rb"
 
 Gem::Specification.new do |s|
   s.name = %q{rhodes}
-  #s.version = Rhodes::VERSION
-  s.version = "2.3.0.beta.1"
+#  s.version = Rhodes::VERSION
+  s.version = "2.3.0.beta.2"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]
   s.date = Time.now

data/spec/phone_spec/app/spec/rho_spec.rb

@@ -22,6 +22,16 @@
 require 'date'
 require 'time'
 
+describe "System" do
+   
+   it "should test app_installed?" do
+   	[1..1000].each do |i|
+   			System::app_installed?("mythebesttestandroidapplication")
+   	end
+   end
+  
+end
+
 describe "RhoConfig" do
 
   before(:each) do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 62196433
+  hash: 62196439
   prerelease: 6
   segments: 
   - 2
   - 3
   - 0
   - beta
-  - 1
-  version: 2.3.0.beta.1
+  - 2
+  version: 2.3.0.beta.2
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 -08:00
+date: 2011-02-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency