rhodes 2.0.0.beta10 → 2.0.0.beta11

data/README.textile

@@ -36,9 +36,9 @@ This will generate a controller as the file controller.rb and several views as a
 
 h2. MORE RESOURCES
 
-There is a "tutorial available":http://rhomobile.com/wiki/index.php/Mobilizing_Your_Application_with_Rhomobile on the "Rhomobile site":http://www.rhomobile.com.  This includes thorough and current platform by platform build instructions.
+There is a "tutorial available":http://rhomobile.com/wiki/index.php/Tutorial2 on the "Rhomobile site":http://www.rhomobile.com.  This includes thorough and current platform by platform build instructions.
 
-The "Rhodes spec":http://rhomobile.com/wiki/index.php/Rhodes is also available on the "Rhomobile documentation wiki":http://rhomobile.com/wiki/index.php?title=Rhomobile. 
+The "Rhodes spec":http://rhomobile.com/wiki/index.php/Rhodes for full documentation on the Rhodes framework.
 
 For further questions "email us":mailto:info@rhomobile.com or join the "Google Group":http://groups.google.com/group/rhomobile.
 

data/bin/rhodes-setup

@@ -57,6 +57,7 @@ end
 
 while true
   android = prompt_for("Android SDK path", android, false)
+  android = "" if android.nil?
 
   android = android.gsub(/\\/,"/")
   apilevel = -1

data/lib/extensions/digest-md5/ext/Rakefile

@@ -10,16 +10,17 @@ def build_extension(name, arch)
 
     args = []
     args << "-I."
-    args << "-I../../../../platform/shared/ruby/include"
-    args << "-I../../../../platform/shared"
+    args << "-I#{$rhoroot}/lib/extensions/digest/ext"
+    args << "-I#{$rhoroot}/platform/shared/ruby/include"
+    args << "-I#{$rhoroot}/platform/shared"
 
     if ENV['RHO_PLATFORM'] == 'android'
-      args << "-I../../../../platform/shared/ruby/linux"
-      args << "-I../../../../platform/shared/ruby/generated"
+      args << "-I#{$rhoroot}/platform/shared/ruby/linux"
+      args << "-I#{$rhoroot}/platform/shared/ruby/generated"
       cc_compile f, $tempdir, args or exit 1
 
     elsif ENV['RHO_PLATFORM'] == 'iphone'
-      args << "-I../../../../platform/shared/ruby/iphone"
+      args << "-I#{$rhoroot}/platform/shared/ruby/iphone"
       args << "-D_XOPEN_SOURCE"
       args << "-D_DARWIN_C_SOURCE"
       args << "-isysroot #{$sdkroot}"

data/lib/extensions/fcntl/ext.yml

@@ -1,2 +1,2 @@
 entry: Init_fcntl
-libraries: [ "libfcntl.a" ]
+libraries: [ "fcntl" ]

data/lib/framework/rho/rho.rb

@@ -192,44 +192,12 @@ module Rho
                 puts "sources after: #{Rho::RhoConfig::sources()}"            
                 return
             end
-            
-            arSrc = res['sources']
-            puts "arSrc: #{arSrc}"
-            return unless arSrc
-
-            hashSrcs = Rhom::RhomSource::find_all_ashash
-            puts "hashSrcs : #{hashSrcs}"
-            Rho::RhoConfig::reset_max_config_srcid()
-            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']
-                src['sync_type'] ||= 'incremental'
-                #if oldSrc
-                #    oldVer = oldSrc.schema_version
-                #    newVer = src['schema_version']
-                #    if ( oldVer != newVer )    
-                #        get_app(APPNAME).on_migrate_source(oldSrc.schema_version, src)
-                #    end
-                #end
-                
-                Rho::RhoConfig::sources[name] = nil
-                @db_partitions.each_value do |db_part|
-                  db_part.delete_from_table('sources', {"name"=>name})
-                end
-                
-                Rho::RhoConfig::add_source(name, src)
-            end
-            
-            init_sources()
-            
-            check_source_migration(get_app(APPNAME))
         rescue Exception => e
             puts "Error load_server_sources: #{e}"
             puts "Trace: #{e.backtrace}"
         end
-            
+        
+        raise ArgumentError, "load_server_sources should be called only from bulk sync with partition parameter!"     
     end
 
     def find_src_byname(uniq_sources, src_name)

data/lib/framework/rho/rhoapplication.rb

@@ -78,8 +78,12 @@ module Rho
         Rho::RhoFSConnector::get_model_path(appname, modelname)
       end
       
-      def get_blob_path(relative_file_path)
-        File.join(__rhoGetCurrentDir(), relative_file_path)
+      def get_blob_folder()
+        Rho::RhoFSConnector::get_blob_folder()
+      end
+      
+      def get_blob_path(relative_path)
+        Rho::RhoFSConnector::get_blob_path(relative_path)      
       end
       
     end

data/lib/framework/rho/rhofsconnector.rb

@@ -27,6 +27,15 @@ module Rho
       def get_db_fullpathname(postfix)
           File.join(__rhoGetCurrentDir(), 'db/syncdb' + postfix + '.sqlite')
       end
+
+      def get_blob_folder()
+        File.join(__rhoGetCurrentDir(), 'db/db-files')
+      end
+      
+      def get_blob_path(relative_path)
+        File.join(__rhoGetCurrentDir(), relative_path)
+      end
+      
     end
   end # RhoApplication
 end # Rho

data/lib/framework/rhodes.rb

@@ -3,7 +3,7 @@ module Rhodes
     VERSION = '2.0.0'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '2.0.4'
+    DBVERSION = '2.0.5'
   end
   
 end

data/lib/rhodes.rb

@@ -3,7 +3,7 @@ module Rhodes
     VERSION = '2.0.0'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '2.0.4'
+    DBVERSION = '2.0.5'
   end
   
 end

data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java

@@ -164,7 +164,7 @@ public class NetworkAccess implements INetworkAccess {
 			url = url.substring(0, fragment);
 		}
 
-		boolean ignoreSuffix = ignoreSuffixOnSim && DeviceInfo.isSimulator();
+		boolean ignoreSuffix = !URI.isLocalHost(url) && ignoreSuffixOnSim && DeviceInfo.isSimulator();
 		HttpConnection http = (HttpConnection)baseConnect(url, ignoreSuffix );
 		return new BBHttpConnection(http);
 	}

data/platform/shared/common/RhoDefs.h

@@ -61,7 +61,7 @@
 #define L_NUM_SEVERITIES  5
 
 #define RHO_STRIP_LOG 0
-#define RHO_STRIP_PROFILER 0
+#define RHO_STRIP_PROFILER 1
 
 typedef int LogSeverity;
 

data/platform/shared/common/RhodesApp.cpp

@@ -448,6 +448,26 @@ void CRhodesApp::setAppBackUrl(const String& url)
         m_strAppBackUrl = "";
 }
 
+String CRhodesApp::getAppTitle()
+{
+    String strTitle = RHOCONF().getString("title_text");
+    if ( strTitle.length() == 0 )
+    {
+#ifdef OS_WINCE
+        String path = rho_native_rhopath();
+        int last, pre_last;
+
+        last = path.find_last_of('\\');
+        pre_last = path.substr(0, last).find_last_of('\\');
+        strTitle = path.substr(pre_last + 1, last - pre_last - 1);
+#else
+        strTitle = "Rhodes";
+#endif
+    }
+
+    return strTitle;
+}
+
 const String& CRhodesApp::getStartUrl()
 {
     m_strStartUrl = canonicalizeRhoUrl( RHOCONF().getString("start_path") );

data/platform/shared/common/RhodesApp.h

@@ -84,6 +84,7 @@ public:
 
     const String& getAppBackUrl(){return m_strAppBackUrl;}
     void setAppBackUrl(const String& url);
+    String getAppTitle();
 
     void callCameraCallback(String strCallbackUrl, const String& strImagePath, const String& strError, boolean bCancel );
     void callDateTimeCallback(String strCallbackUrl, long lDateTime, const char* szData, int bCancel );

data/platform/shared/db/DBAdapter.cpp

@@ -38,6 +38,22 @@ void SyncBlob_DeleteCallback(sqlite3_context* dbContext, int nArgs, sqlite3_valu
     attrMgr.remove( nSrcID, szAttrName );
 }
 
+void SyncBlob_UpdateCallback(sqlite3_context* dbContext, int nArgs, sqlite3_value** ppArgs)
+{
+    if ( nArgs < 3 )
+        return;
+
+    CDBAttrManager& attrMgr = CDBAdapter::getDBByHandle(sqlite3_context_db_handle(dbContext)).getAttrMgr();
+
+    char* szAttrName = (char*)sqlite3_value_text(*(ppArgs+2));
+    int nSrcID = sqlite3_value_int(*(ppArgs+1));
+    if ( attrMgr.isBlobAttr(nSrcID, szAttrName) )
+    {
+        String strFilePath = RHODESAPP().resolveDBFilesPath((char*)sqlite3_value_text(*(ppArgs)));
+        CRhoFile::deleteFile(strFilePath.c_str());
+    }
+}
+
 void SyncBlob_DeleteSchemaCallback(sqlite3_context* dbContext, int nArgs, sqlite3_value** ppArgs)
 {
     CDBAttrManager& attrMgr = CDBAdapter::getDBByHandle(sqlite3_context_db_handle(dbContext)).getAttrMgr();
@@ -107,6 +123,9 @@ void CDBAdapter::open (String strDbPath, String strVer, boolean bTemp)
 
     sqlite3_create_function( m_dbHandle, "rhoOnDeleteObjectRecord", 3, SQLITE_ANY, 0,
 	    SyncBlob_DeleteCallback, 0, 0 );
+    sqlite3_create_function( m_dbHandle, "rhoOnUpdateObjectRecord", 3, SQLITE_ANY, 0,
+	    SyncBlob_UpdateCallback, 0, 0 );
+
     sqlite3_create_function( m_dbHandle, "rhoOnDeleteRecord", 1, SQLITE_ANY, 0,
 	    SyncBlob_DeleteSchemaCallback, 0, 0 );
 
@@ -140,7 +159,7 @@ boolean CDBAdapter::migrateDB(const CDBVersion& dbVer, const String& strRhoDBVer
     //id INTEGER PRIMARY KEY, REMOVE
         LOG(INFO) + "Migrate database from " + dbVer.m_strRhoVer + " to " + strRhoDBVer;
 
-        CDBAdapter db(m_strDbPartition.c_str());
+        CDBAdapter db(m_strDbPartition.c_str(), true);
         db.open( m_strDbPath, m_strDbVer, true );
         DBResult( res, db.executeSQL( "ALTER TABLE sources ADD priority INTEGER" ));
         DBResult( res1, db.executeSQL( "ALTER TABLE sources ADD backend_refresh_time int default 0" ));
@@ -335,7 +354,7 @@ void CDBAdapter::destroy_tables(const rho::Vector<rho::String>& arIncludeTables,
     CRhoFile::deleteFile((dbNewName+"-journal").c_str());
     CRhoFile::deleteFile((dbNewName+".version").c_str());
 
-    CDBAdapter db(m_strDbPartition.c_str());
+    CDBAdapter db(m_strDbPartition.c_str(), true);
     db.open( dbNewName, m_strDbVer, true );
 
     //Copy all tables
@@ -389,7 +408,7 @@ void CDBAdapter::copyTable(String tableName, CDBAdapter& dbFrom, CDBAdapter& dbT
 
 void CDBAdapter::setBulkSyncDB(String fDataName)
 {
-    CDBAdapter db(m_strDbPartition.c_str());
+    CDBAdapter db(m_strDbPartition.c_str(), true);
     db.open( fDataName, m_strDbVer, true );
     db.createTriggers();
 
@@ -718,7 +737,7 @@ int rho_db_open(const char* szDBPath, const char* szDBPartition, void** ppDB)
     CDBAdapter* pDB = CDBAdapter::getDBPartitions().get(szDBPartition);
     if ( !pDB )
     {
-        pDB = new CDBAdapter(szDBPartition);
+        pDB = new CDBAdapter(szDBPartition, false);
         CDBAdapter::getDBPartitions().put(szDBPartition, pDB);
     }
 
@@ -833,13 +852,16 @@ void rho_db_init_attr_manager()
 namespace rho{
 namespace common{
 
-CRubyMutex::CRubyMutex() : m_nLockCount(0), m_valThread(0), m_valMutex(null)
+CRubyMutex::CRubyMutex(boolean bIgnore) : m_nLockCount(0), m_valThread(0), m_valMutex(null)
 {
+    if ( !bIgnore )
+        m_valMutex = rho_ruby_create_mutex();
 }
 
 CRubyMutex::~CRubyMutex()
 {
-    rho_ruby_destroy_mutex(m_valMutex);
+    if ( m_valMutex )
+        rho_ruby_destroy_mutex(m_valMutex);
 }
 
 boolean CRubyMutex::isMainRubyThread()
@@ -849,15 +871,15 @@ boolean CRubyMutex::isMainRubyThread()
 
 void CRubyMutex::Lock()
 {
+    if ( m_valMutex == null )
+        return;
+
     unsigned long curThread = rho_ruby_current_thread();
     if ( curThread == null )
         return;
 
     if ( m_valThread != curThread )
     {
-        if ( m_valMutex == null )
-            m_valMutex = rho_ruby_create_mutex();
-
         rho_ruby_lock_mutex(m_valMutex);
         m_valThread = curThread;
         m_nLockCount = 1;
@@ -867,6 +889,9 @@ void CRubyMutex::Lock()
 
 void CRubyMutex::Unlock()
 {
+    if ( m_valMutex == null )
+        return;
+
     m_nLockCount--;
     if ( m_nLockCount == 0 )
     {

data/platform/shared/db/DBAdapter.h

@@ -12,7 +12,7 @@ class CRubyMutex
     unsigned long m_valThread, m_valMutex;
 
 public:
-    CRubyMutex();
+    CRubyMutex(boolean bIgnore);
     ~CRubyMutex();
 
     boolean isMainRubyThread();
@@ -54,8 +54,8 @@ class CDBAdapter
 public:
     DEFINE_LOGCLASS;
 
-    CDBAdapter(const char* szDBPartition) : m_dbHandle(0), m_strDbPath(""), m_strDbPartition(szDBPartition),
-        m_bUIWaitDB(false), m_nTransactionCounter(0) {}
+    CDBAdapter(const char* szDBPartition, boolean bNoRubyLock) : m_dbHandle(0), m_strDbPath(""), m_strDbPartition(szDBPartition),
+        m_bUIWaitDB(false), m_nTransactionCounter(0), m_mxRuby(bNoRubyLock) {}
     ~CDBAdapter(void){}
 
     void open (String strDbPath, String strVer, boolean bTemp);

data/platform/shared/net/AsyncHttp.cpp

@@ -91,7 +91,7 @@ CAsyncHttp::CHttpCommand::CHttpCommand(
     const char* file_path,
     const char* callback, const char* callback_params, boolean ssl_verify_peer)
 {
-    m_strUrl = url != null ? url : "";
+    m_strUrl = RHODESAPP().canonicalizeRhoUrl(url != null ? url : "");
     m_strBody = body != null ? body : "";
     m_strFilePath = file_path != null ? file_path : "";
     m_strCallback = callback != null ? callback : "";

data/platform/shared/rubyJVM/src/com/rho/net/AsyncHttp.java

@@ -44,7 +44,7 @@ public class AsyncHttp extends RhoThread
 		super(factory);
 		
 	    m_ptrFactory = factory;
-	    m_strUrl = url != null ? url : "";
+	    m_strUrl = RHODESAPP().canonicalizeRhoUrl(url != null ? url : "");
 	    m_strBody = body != null ? body : "";
 	    m_strFilePath = filepath != null ? filepath : "";
 	    m_strCallback = callback != null ? callback : "";

data/platform/shared/rubyJVM/src/com/rho/net/NetRequest.java

@@ -556,7 +556,7 @@ public class NetRequest
 		    			}
 		    		}while( !m_bCancel && nRead >= 0 );
 		    		
-		    		if ( code == IHttpConnection.HTTP_PARTIAL_CONTENT && isFinishDownload() )
+		    		if ( code == IHttpConnection.HTTP_OK || (code == IHttpConnection.HTTP_PARTIAL_CONTENT && isFinishDownload()) )
 		    			m_nCurDownloadSize = 0;
 				}
 				

data/platform/shared/rubyJVM/src/com/rho/net/URI.java

@@ -800,7 +800,8 @@ import com.rho.Tokenizer;
     return schemespec.toString();
   }
 
-  public String getPathSpecificPart() {
+  public String getHostSpecificPart() 
+  {
     StringBuffer schemespec = new StringBuffer();
 
     if (m_scheme != null) {
@@ -832,10 +833,6 @@ import com.rho.Tokenizer;
       }
     }
 
-    if (m_path != null) {
-      schemespec.append((m_path));
-    }
-  
 	return schemespec.toString();	    
   }
   
@@ -1219,12 +1216,12 @@ import com.rho.Tokenizer;
 	  
 	  return sb.toString();
   }
-/*  
+  
   public static boolean isLocalHost(String strUrl)
   {
 	  return strUrl.startsWith("http://localhost") ||
 	  	strUrl.startsWith("http://127.0.0.1");
-  }*/
+  }
 
   public static boolean isLocalData(String strUrl)
   {

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

@@ -499,10 +499,10 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    
 	    if ( !resp.isOK() )
 	    	m_nErrCode = RhoRuby.getErrorFromResponse(resp);
-	    else
+	    /*else
     	{
     		processServerSources(resp.getCharData());
-    	}
+    	}*/
 	    
 	    return resp.isOK();
 	}
@@ -521,8 +521,8 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    	
 	        JSONEntry oJsonEntry = new JSONEntry(szData);
 	
-	        if (oJsonEntry.hasName("sources") )
-	            processServerSources(szData);
+	        //if (oJsonEntry.hasName("sources") )
+	        //    processServerSources(szData);
 	        
 	        JSONEntry oJsonObject = oJsonEntry.getEntry("client");
 	        if ( !oJsonObject.isEmpty() )
@@ -614,7 +614,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    getNotify().fireBulkSyncNotification(false, "download", strPartition, RhoRuby.ERR_NONE);
 	    
 	    String fDataName = makeBulkDataFileName(strDataUrl, dbPartition.getDBPath(), "_bulk.data");
-	    String strHsqlDataUrl = getHostFromUrl(serverUrl) + strDataUrl + ".hsqldb.data";
+	    String strHsqlDataUrl = FilePath.join(getHostFromUrl(serverUrl), strDataUrl) + ".hsqldb.data";
 	    LOG.INFO("Bulk sync: download data from server: " + strHsqlDataUrl);
 	    {
 		    NetResponse resp1 = getNet().pullFile(strHsqlDataUrl, fDataName, this, null);
@@ -631,7 +631,7 @@ public class SyncEngine implements NetRequest.IRhoSession
             return;
 	    
 	    String fScriptName = makeBulkDataFileName(strDataUrl, dbPartition.getDBPath(), "_bulk.script" );
-	    String strHsqlScriptUrl = getHostFromUrl(serverUrl) + strDataUrl + ".hsqldb.script";
+	    String strHsqlScriptUrl = FilePath.join(getHostFromUrl(serverUrl), strDataUrl) + ".hsqldb.script";
 	    LOG.INFO("Bulk sync: download script from server: " + strHsqlScriptUrl);
 	    {
 		    NetResponse resp1 = getNet().pullFile(strHsqlScriptUrl, fScriptName, this, null);
@@ -820,7 +820,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	static String getHostFromUrl( String strUrl )
 	{
 		URI uri = new URI(strUrl);
-		return uri.getPathSpecificPart() + "/";
+		return uri.getHostSpecificPart() + "/";
 	}
 	
 }

data/platform/shared/sync/SyncEngine.cpp

@@ -395,10 +395,10 @@ boolean CSyncEngine::resetClientIDByNet(const String& strClientID)//throws Excep
 
     if ( !resp.isOK() )
         m_nErrCode = RhoRuby.getErrorFromResponse(resp);
-    else
+    /*else
     {
         processServerSources(resp.getCharData());
-    }
+    } */
 
     return resp.isOK();
 }
@@ -429,8 +429,8 @@ String CSyncEngine::requestClientIDByNet()
 
         CJSONEntry oJsonEntry(szData);
 
-        if (oJsonEntry.hasName("sources") )
-            processServerSources(szData);
+        //if (oJsonEntry.hasName("sources") )
+        //    processServerSources(szData);
 
         CJSONEntry oJsonObject = oJsonEntry.getEntry("client");
         if ( !oJsonObject.isEmpty() )
@@ -527,11 +527,7 @@ void CSyncEngine::loadBulkPartition(const String& strPartition )
 
     String fDataName = makeBulkDataFileName(strDataUrl, dbPartition.getDBPath(), "");
     String strZip = ".rzip";
-	String hostName = getHostFromUrl(serverUrl);
-	if (hostName.c_str()[hostName.length()-1] == '/') {
-		hostName = hostName.substr(0,hostName.length()-1);
-	}
-    String strSqlDataUrl = hostName + strDataUrl+strZip;
+    String strSqlDataUrl = CFilePath::join(getHostFromUrl(serverUrl), strDataUrl) +strZip;
     LOG(INFO) + "Bulk sync: download data from server: " + strSqlDataUrl;
     {
         NetResponse( resp1, getNet().pullFile(strSqlDataUrl, fDataName+strZip, this, null) );

data/platform/shared/sync/SyncThread.cpp

@@ -308,12 +308,13 @@ int rho_sync_get_pagesize()
 
 void rho_sync_set_pagesize(int nPageSize)
 {
-    return CSyncThread::getSyncEngine().setSyncPageSize(nPageSize);
+    CSyncThread::getSyncEngine().setSyncPageSize(nPageSize);
 }
 
 void rho_sync_set_threaded_mode(int b)
 {
-    return CSyncThread::getSyncEngine().setNonThreadedMode(b==0);
+    CSyncThread::getInstance()->setNonThreadedMode(b==0);
+    CSyncThread::getSyncEngine().setNonThreadedMode(b==0);
 }
 
 }

data/platform/wm/rhodes/MainWindow.cpp

@@ -216,6 +216,11 @@ Error:
     return SUCCEEDED(hr) ? 0 : -1;
 }
 
+LRESULT CMainWindow::OnSetText(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled)
+{
+    return TRUE;
+}
+
 LRESULT CMainWindow::OnDestroy(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled)
 {
 #if defined (_WIN32_WCE)
@@ -550,12 +555,12 @@ void __stdcall CMainWindow::OnBeforeNavigate2(IDispatch* pDisp, VARIANT * pvtURL
     LPCTSTR szURL = OLE2CT(V_BSTR(pvtURL));
 
     LOG(TRACE) + "OnBeforeNavigate2: " + szURL ;
-
+/*
     String strTitle = RHOCONF().getString("title_text");
     if ( strTitle.length() > 0 )
         SetWindowText(convertToStringW(strTitle).c_str());
     else
-        SetWindowText(TEXT("Untitled"));
+        SetWindowText(TEXT("Untitled"));*/
 	
     //RHO_ASSERT(SetMenuItemEnabled(IDM_STOP, TRUE));
 }

data/platform/wm/rhodes/MainWindow.h

@@ -74,6 +74,7 @@ public:
         MESSAGE_HANDLER(WM_ACTIVATE, OnActivate)
         MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChange)
         MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
+        MESSAGE_HANDLER(WM_SETTEXT, OnSetText)
 		MESSAGE_HANDLER(WM_PAINT, OnPaint)
         COMMAND_ID_HANDLER(IDM_EXIT, OnExitCommand)
         COMMAND_ID_HANDLER(IDM_NAVIGATE_BACK, OnNavigateBackCommand)
@@ -102,6 +103,7 @@ private:
     LRESULT OnDestroy(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled);
 	LRESULT OnPaint(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
 	LRESULT OnSize(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
+    LRESULT OnSetText(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled);
 
     // WM_COMMAND handlers
     LRESULT OnExitCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);

data/platform/wm/rhodes/Rhodes.cpp

@@ -61,14 +61,15 @@ public :
 			}
 
 #if defined(OS_WINDOWS)
-			if (wcsncmp(lpszToken, _T("http_proxy"),10)==0) {
+			if (wcsncmp(lpszToken, _T("http_proxy_url"),14)==0) {
 				char *token = wce_wctomb(lpszToken);
 				char *proxy =parseToken(token,strlen(token));
+				
+				if (proxy)
+				  httpProxy = proxy;
 
-				httpProxy = proxy;
-
-				free(proxy);
-				free(token);
+				if (proxy) free(proxy);
+				if (token) free(token);
 
 			} else if (wcsncmp(lpszToken, _T("approot"),7)==0) {
 				char* token = wce_wctomb(lpszToken);
@@ -175,9 +176,10 @@ public :
 	    }
 
         rho::common::CRhodesApp::Create(m_strRootPath );
+        String strTitle = RHODESAPP().getAppTitle();
 
         // Create the main application window
-        m_appWindow.Create(NULL, CWindow::rcDefault, TEXT("Rhodes"), WS_VISIBLE);
+        m_appWindow.Create(NULL, CWindow::rcDefault, convertToStringW(strTitle).c_str(), WS_VISIBLE);
         if (NULL == m_appWindow.m_hWnd)
         {
             return S_FALSE;
@@ -201,7 +203,7 @@ public :
 			NULL, 
 			&g_hNotify);
 #else
-		rho_clientregister_create("win32_client");
+		//rho_clientregister_create("win32_client");
 #endif
 
         return S_OK;

data/res/build-tools/db/syncdb.triggers

@@ -2,6 +2,11 @@ CREATE TRIGGER rhodeleteTrigger BEFORE DELETE ON object_values FOR EACH ROW
    BEGIN 
        SELECT rhoOnDeleteObjectRecord(OLD.value, OLD.source_id, OLD.attrib );
    END;
+;
+CREATE TRIGGER rhoupdateTrigger BEFORE UPDATE ON object_values FOR EACH ROW WHEN NEW.value != OLD.value
+   BEGIN 
+       SELECT rhoOnUpdateObjectRecord(OLD.value, OLD.source_id, OLD.attrib );
+   END;
 ;   
 CREATE TRIGGER rhoinsertTrigger AFTER INSERT ON object_values FOR EACH ROW 
    BEGIN 

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.beta10'
+  s.version = '2.0.0.beta11'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]

data/spec/framework_spec/app/BlobTest/blob_test.rb

@@ -0,0 +1,11 @@
+require 'rhom'
+
+class BlobTest
+    include Rhom::PropertyBag
+
+    enable :sync
+    
+    property :image_uri, :blob, :overwrite
+
+    
+end