rhodes 2.0.0.beta8 → 2.0.0.beta9

data/bin/rhodes-setup

@@ -55,28 +55,37 @@ if ENV['ANDROID_HOME']
   android = ENV['ANDROID_HOME']
 end
 
-android = android.gsub(/\\/,"/")
-apilevel = -1
-android_platform_dir = "/platforms/android-1.5"
-Dir.glob(File.join(android, 'platforms', '*')).each do |dir|
-  props = File.join(dir, 'source.properties')
-  next unless File.file? props
-  File.open(props, 'r') do |f|
-    while line = f.gets
-      next if line !~ /^\s*AndroidVersion\.ApiLevel\s*=\s*([0-9]+)\s*$/
-      apilevel = $1.to_i
+while true
+  android = prompt_for("Android SDK path", android, false)
+
+  android = android.gsub(/\\/,"/")
+  apilevel = -1
+  android_platform_dir = "/platforms/android-1.5"
+  Dir.glob(File.join(android, 'platforms', '*')).each do |dir|
+    props = File.join(dir, 'source.properties')
+    next unless File.file? props
+    File.open(props, 'r') do |f|
+      while line = f.gets
+        next if line !~ /^\s*AndroidVersion\.ApiLevel\s*=\s*([0-9]+)\s*$/
+        apilevel = $1.to_i
+        break
+      end
+    end
+
+    if apilevel == 3
+      android_platform_dir = dir[android.length..-1]
       break
     end
   end
+  android = "" if apilevel == -1
 
-  if apilevel == 3
-    android_platform_dir = dir[android.length..-1]
-    break
+  unless File.directory? File.join(android, android_platform_dir)
+    puts "Invalid Android SDK path"
+    next
   end
-end
-android = "" if apilevel == -1
 
-android = prompt_for("Android SDK path", android, false, android_platform_dir)
+  break
+end
 
 # try to detect android ndk
 ndks = Dir.glob(File.dirname(android) + "/android-ndk-*").sort

data/lib/framework/rho/rho.rb

@@ -183,9 +183,11 @@ module Rho
 
             hashSrcs = Rhom::RhomSource::find_all_ashash
             puts "hashSrcs : #{hashSrcs}"
-            arSrc.each do |src|
-                oldSrc = hashSrcs[src['name']]
+            arSrc.each do |name, src|
+                oldSrc = hashSrcs[name]
                 puts "oldSrc: #{oldSrc}"
+                #update schema_version
+                src['schema_version'] = src['schema']['version'] if src['schema'] && src['schema']['version']
                 if oldSrc
                     oldVer = oldSrc.schema_version
                     newVer = src['schema_version']
@@ -194,14 +196,14 @@ module Rho
                     end
                 end
                 
-                Rho::RhoConfig::add_source(src['name'], src)
+                Rho::RhoConfig::add_source(name, src)
             end
             
             init_sources()
-      rescue Exception => e
-        puts "Error load_server_sources: #{e}"
-        puts "Trace: #{e.backtrace}"
-      end
+        rescue Exception => e
+            puts "Error load_server_sources: #{e}"
+            puts "Trace: #{e.backtrace}"
+        end
             
     end
 
@@ -282,6 +284,10 @@ module Rho
                 
                 index_param.each do |index_name, index_cols|
                     strCols = ""
+                    if index_cols.is_a?(String)
+                        index_cols = index_cols.split(',')    
+                    end
+                    
                     index_cols.each do |col|
                         strCols += ',' if strCols.length() > 0
                         strCols += "\"#{col}\""
@@ -350,14 +356,15 @@ module Rho
       
       if source['schema'] && source['schema']['property']
         str = ""
-        source['schema']['property'].each do |name, type|
-            if type && type.is_a?(Hash)
-                next unless type[:blob] || type['blob']
-                str += ',' if str.length()>0
-                str += name.to_s() + ',' + (type[:server_overwrite]||type[:server_overwrite].to_i() ? '1' : '0')
-            elsif type && type.to_s == 'blob'
+        source['schema']['property'].each do |name, ar_type|
+            if ar_type && ar_type.is_a?(String)
+                ar_type = ar_type.split(',')    
+            end
+            
+            if ar_type && ar_type[0].to_s == 'blob'
                 str += ',' if str.length()>0
-                str += name.to_s() + ',0'
+                str += name.to_s() + ','
+                str += (ar_type[1].to_s() == 'overwrite' ? '1' : '0')
             end
         end
         

data/lib/framework/rhom/rhom.rb

@@ -54,7 +54,8 @@ module Rhom
             db.destroy_tables(:exclude => ['sources','client_info'])
         end
       
-        ::Rho::RHO.init_schema_sources  
+        hash_migrate = {}
+        ::Rho::RHO.init_schema_sources(hash_migrate) 
       end
       
       def database_full_reset_and_logout

data/lib/framework/rhom/rhom_model.rb

@@ -22,14 +22,14 @@ module Rhom
         false
     end
     
-    def property(name,type=:string)
+    def property(name,type=:string,option=nil)
       fixed_schema?()
 
   	  BaseModel.model_params ||= {}
 
       BaseModel.model_params['schema'] ||= {}
       BaseModel.model_params['schema']['property'] ||= {}
-      BaseModel.model_params['schema']['property'][name.to_s] = type 
+      BaseModel.model_params['schema']['property'][name.to_s] = [type,option] 
       
 
     end

data/platform/iphone/Classes/TabbedMainView.m

@@ -77,6 +77,8 @@
     NSMutableArray *views = [NSMutableArray arrayWithCapacity:count];
     NSMutableArray *tabs = [[NSMutableArray alloc] initWithCapacity:count];
     
+    NSString *initUrl = nil;
+    
     for (int i = 0; i < count; ++i) {
         int index = i*4 - 1;
         NSString *label = [items objectAtIndex:++index];
@@ -84,6 +86,9 @@
         NSString *icon = [items objectAtIndex:++index];
         NSString *reload = [items objectAtIndex:++index];
         
+        if (!initUrl)
+            initUrl = url;
+        
         if (label && url && icon) {
             RhoTabBarData *td = [[RhoTabBarData alloc] init];
             td.url = url;
@@ -93,7 +98,7 @@
             subController.title = label;
             NSString *imagePath = [[AppManager getApplicationsRootPath] stringByAppendingPathComponent:icon];
             subController.tabBarItem.image = [UIImage imageWithContentsOfFile:imagePath];
-            [subController navigateRedirect:url tab:0];
+            //[subController navigateRedirect:url tab:0];
             
             [tabs addObject:td];
             [views addObject:subController];
@@ -109,6 +114,9 @@
     self.tabbarData = tabs;
     [tabs release];
     
+    if (initUrl)
+        [self navigateRedirect:initUrl tab:0];
+    
     return self;
 }
 

data/platform/shared/ruby/thread.c

@@ -324,6 +324,11 @@ rb_thread_terminate_all(void)
     thread_debug("rb_thread_terminate_all (main thread: %p)\n", (void *)th);
     st_foreach(vm->living_threads, terminate_i, (st_data_t)th);
 
+#if USE_NATIVE_THREAD_PRIORITY
+    th->priority -= 2;
+    native_thread_apply_priority(th);
+#endif
+
     while (!rb_thread_alone()) {
 	PUSH_TAG();
 	if (EXEC_TAG() == 0) {

data/platform/shared/ruby/thread_win32.c

@@ -17,7 +17,7 @@
 #define WIN32_WAIT_TIMEOUT 10	/* 10 ms */
 #undef Sleep
 
-#define native_thread_yield() Sleep(0)
+#define native_thread_yield() Sleep(10)
 #define remove_signal_thread_list(th)
 
 static volatile DWORD ruby_native_thread_key = TLS_OUT_OF_INDEXES;

data/platform/shared/rubyJVM/src/com/rho/sync/SyncEngine.java

@@ -723,6 +723,15 @@ public class SyncEngine implements NetRequest.IRhoSession
 	void login(String name, String password, String callback)
 	{
 		try {
+/*			
+			processServerSources("{\"sources\":{ \"ProductEx\":{ "+
+	        "\"sync_type\":\"incremental\", \"partition\":\"application\", \"source_id\":\"7\","+
+	        " \"sync_priority\":\"0\", \"model_type\":\"fixed_schema\", "+
+	        " \"schema\":{\"version\":\"1.1\", \"property\":{\"brand\":\"string\", \"price\":\"string\", \"quantity\":\"string\", \"name\":\"string\", "+
+	        " \"image_url\":\"blob\", \"image_url_ex\":\"blob,overwrite\"}, "+
+	        " \"index\":[{\"by_brand_price1\":\"brand,price\"}, {\"by_quantity1\":\"quantity\"}], \"unique_index\":[{\"by_name1\":\"name\"}]}, "+
+	        " \"belongs_to\":{\"brand\":\"Customer\"}}}}");//, \"schema_version\":\"1.0\"
+	        */
 		    NetResponse resp = null;
 		    
 		    try{

data/platform/shared/sync/SyncEngine.cpp

@@ -364,7 +364,7 @@ void CSyncEngine::processServerSources(String strSources)
         /*NetResponse(resp,getNet().pushData( getNet().resolveUrl("/system/loadserversources"), strSources, null ));
         loadAllSources();
 
-        rho_db_init_attr_manager(); */
+        rho_db_init_attr_manager();*/
     }
 }
 
@@ -626,14 +626,13 @@ void CSyncEngine::login(String name, String password, String callback)
 {
 /*
     processServerSources(
-        "{\"sources\":[{ \"name\":\"ProductEx\", "
+        "{\"sources\":{ \"ProductEx\":{ "
         "\"sync_type\":\"incremental\", \"partition\":\"application\", \"source_id\":\"7\","
         " \"sync_priority\":\"0\", \"model_type\":\"fixed_schema\", "
-        " \"schema\":{\"property\":{\"brand\":\"string\", \"price\":\"string\", \"quantity\":\"string\", \"name\":\"string\", "
-        " \"image_url\":\"blob\", \"image_url_ex\":{\"blob\":\"1\", \"server_overwrite\":\"1\"}}, "
-        " \"index\":[{\"by_brand_price1\":[\"brand\", \"price\"]}, {\"by_quantity1\":[\"quantity\"]}], \"unique_index\":[{\"by_name1\":[\"name\"]}]}, "
-        " \"belongs_to\":{\"brand\":\"Customer\"}, "
-        " \"schema_version\":\"1.0\"}]}");
+        " \"schema\":{\"version\":\"1.1\", \"property\":{\"brand\":\"string\", \"price\":\"string\", \"quantity\":\"string\", \"name\":\"string\", "
+        " \"image_url\":\"blob\", \"image_url_ex\":\"blob,overwrite\"}, "
+        " \"index\":[{\"by_brand_price1\":\"brand,price\"}, {\"by_quantity1\":\"quantity\"}], \"unique_index\":[{\"by_name1\":\"name\"}]}, "
+        " \"belongs_to\":{\"brand\":\"Customer\"}}}}");//, \"schema_version\":\"1.0\"
 */
     PROF_START("Login");
 	//try {

data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp

@@ -191,7 +191,7 @@ CNetResponseImpl* CNetRequestImpl::sendString(const String& strBody)
 
         if ( !HttpSendRequest( m_hRequest, NULL, 0, const_cast<char*>(strBody.c_str()), strBody.length() ) )
         {
-            if (checkSslCertError())
+            if (!m_bCancel && checkSslCertError())
             {
                 if ( !HttpSendRequest( m_hRequest, NULL, 0, const_cast<char*>(strBody.c_str()), strBody.length() ) )
                 {
@@ -319,6 +319,9 @@ void CNetRequestImpl::readResponse(CNetResponseImpl* pNetResp)
     wchar_t szHttpRes[10];
     DWORD nIndex = 0;
 
+    if ( m_bCancel )
+        return;
+
     if( !HttpQueryInfo( m_hRequest, HTTP_QUERY_STATUS_CODE, szHttpRes, &dwLen, &nIndex) )
     {
         m_pszErrFunction = L"HttpQueryInfo";
@@ -379,7 +382,7 @@ CNetResponseImpl* CNetRequestImpl::downloadFile(common::CRhoFile& oFile)
 
         if ( !HttpSendRequest( m_hRequest, NULL, 0, NULL, 0 ) )
         {
-            if (checkSslCertError())
+            if (!m_bCancel && checkSslCertError())
             {
                 if ( !HttpSendRequest( m_hRequest, NULL, 0, NULL, 0 ) )
                 {
@@ -617,9 +620,9 @@ void CNetRequestImpl::cancel()
 
 	if ( m_hRequest ) 
         InternetCloseHandle(m_hRequest);
-/*	if ( hConnection ) 
-        InternetCloseHandle(hConnection);
-	if ( hInet ) 
+	if ( m_hConnection ) 
+        InternetCloseHandle(m_hConnection);
+/*	if ( hInet ) 
         InternetCloseHandle(hInet); */
 /*
     hRequest = 0;
@@ -657,6 +660,9 @@ CNetRequestImpl::~CNetRequestImpl()
 void CNetRequestImpl::readInetFile( HINTERNET hRequest, CNetResponseImpl* pNetResp, common::CRhoFile* pFile /*=NULL*/,
     char* pBuf, DWORD dwBufSize )
 {
+    if (m_bCancel)
+        return;
+
     //if ( pNetResp->getRespCode() == 500 || pNetResp->getRespCode() == 422 )
     //    return;
     char* pBufToFree = 0;
@@ -694,7 +700,7 @@ void CNetRequestImpl::readInetFile( HINTERNET hRequest, CNetResponseImpl* pNetRe
 
         pNetResp->setValid(true);
 
-    }while(bRead && dwBytesRead > 0);
+    }while(bRead && dwBytesRead > 0 && !m_bCancel );
 
     if ( !pNetResp->isOK() )
         LOG(TRACE) + "Server response: " + pNetResp->getCharData();

data/rhodes.gemspec

@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
 
 Gem::Specification.new do |s|
   s.name = %q{rhodes}
-  s.version = '2.0.0.beta8'
+  s.version = '2.0.0.beta9'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]
@@ -14,7 +14,8 @@ Gem::Specification.new do |s|
   files = Array.new
   IO.read("Manifest.txt").each_line {|x| files << x.chomp}
   s.files =  files
-  s.has_rdoc = true
+  # disable rdoc until we fix the docs
+  s.has_rdoc = false
   s.homepage = %q{http://www.rhomobile.com}
   s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
   s.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: -1848230044
+  hash: -1848230043
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
-  - beta8
-  version: 2.0.0.beta8
+  - beta9
+  version: 2.0.0.beta9
 platform: ruby
 authors: 
 - Rhomobile