rhodes 3.3.1 → 3.3.2.beta.1

data/platform/wp7/RhoRubyLib/sync/ClientRegister.cs

@@ -10,6 +10,7 @@ namespace rho.sync
         private static RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
 		    new RhoLogger("ClientRegister");
         private static CRhodesApp RHODESAPP() { return CRhodesApp.Instance; }
+        RhoConf RHOCONF() { return RhoConf.getInstance(); }
 	
 	    private static int WAIT_BEFOREKILL_SECONDS  = 3;
 	    private static int POLL_INTERVAL_SECONDS = 60;
@@ -111,9 +112,9 @@ namespace rho.sync
     	
 		    IDBResult res = DBAdapter.getUserDB().executeSQL("SELECT token,token_sent from client_info");
             if ( !res.isEnd() ) {
-			    String token = res.getStringByIdx(0); 
-			    int token_sent = res.getIntByIdx(1);
-			    if ( m_strDevicePin.equals(token) && token_sent > 0 ) 
+			    String token = res.getStringByIdx(0);
+                boolean token_sent = res.getIntByIdx(1) > 0 && !RHOCONF().getBool("register_push_at_startup");
+                if (m_strDevicePin.equals(token) && token_sent)  
 			    {
 				    //token in db same as new one and it was already send to the server
 				    //so we do nothing

data/platform/wp7/RhoRubyLib/sync/SyncEngine.cs

@@ -222,7 +222,7 @@ namespace rho.sync
             stopSync();
         }
     
-        public void doSyncAllSources()
+        public void doSyncAllSources(String strQueryParams)
         {
 	        try
 	        {
@@ -237,8 +237,8 @@ namespace rho.sync
 			        PROF.CREATE_COUNTER("Data1");
 			        PROF.CREATE_COUNTER("Pull");
 			        PROF.START("Sync");
-	
-	                syncAllSources();
+
+                    syncAllSources(strQueryParams);
 	
 			        PROF.DESTROY_COUNTER("Net");	    
 			        PROF.DESTROY_COUNTER("Parse");
@@ -432,7 +432,7 @@ namespace rho.sync
 		    
         }
 
-        public void doSyncSource(SourceID oSrcID)
+        public void doSyncSource(SourceID oSrcID, String strQueryParams)
         {
             SyncSource src = null;
 
@@ -446,8 +446,9 @@ namespace rho.sync
 	                if ( src != null )
 	                {
 		                LOG.INFO("Started synchronization of the data source: " + src.getName() );
-	
-	                    src.sync();
+
+                        src.m_strQueryParams = strQueryParams;
+                        src.sync();
 	
 				        getNotify().fireSyncNotification(src, true, src.m_nErrCode, src.m_nErrCode == RhoAppAdapter.ERR_NONE ? RhoAppAdapter.getMessageText("sync_completed") : "");
 	                }else
@@ -658,28 +659,16 @@ namespace rho.sync
 	
 	    boolean resetClientIDByNet(String strClientID)
 	    {
-            //String strBody = "";
-            //TODO: send client register info in client reset 
-    //        if ( ClientRegister.getInstance() != null )
-    //            strBody += ClientRegister.getInstance().getRegisterBody();
-
-	        NetResponse resp = getNetClientID().pullData(getProtocol().getClientResetUrl(strClientID), this);
-    /*	    
-	        processServerSources("{\"server_sources\":[{\"name\":\"Product\",\"partition\":\"application\",\"source_id\":\"2\",\"sync_priority\":\"0\","+
-	    	        "\"schema_version\":\"7.0\",\"schema\":{"+
-	    	        "\"columns\":[\'brand\',\'created_at\',\'name\',\'price\',\'quantity\',\'sku\',\'updated_at\']"+
-	    	        "}}]}"); 
-    */	    				
+	        NetResponse resp = getNetClientID().pullData(getProtocol().getClientResetUrl(strClientID), this);   				
 	    
 	        if ( !resp.isOK() )
 	        {
 	    	    m_nErrCode = RhoAppAdapter.getErrorFromResponse(resp);
 	    	    m_strError = resp.getCharData();
-	        }
-	        /*else
-    	    {
-    		    processServerSources(resp.getCharData());
-    	    }*/
+            }
+            else
+                RHOCONF().setString("reset_models", "", true);
+
 	    
 	        return resp.isOK();
 	    }
@@ -864,7 +853,7 @@ namespace rho.sync
 	        return -1;
 	    }
 */
-	    void syncOneSource(int i)
+	    void syncOneSource(int i, String strQueryParams)
 	    {
     	    SyncSource src = null;
     	    //boolean bError = false;
@@ -872,9 +861,12 @@ namespace rho.sync
 		        src = (SyncSource)m_sources.elementAt(i);
 		        if ( src.getSyncType().compareTo("bulk_sync_only")==0 )
 		            return;
-	
-		        if ( isSessionExist() && getState() != esStop )
-		            src.sync();
+
+                if (isSessionExist() && getState() != esStop)
+                {
+                    src.m_strQueryParams = strQueryParams;
+                    src.sync();
+                }
 	
 		        //getNotify().onSyncSourceEnd(i, m_sources);
     	    }catch(Exception exc)
@@ -893,7 +885,7 @@ namespace rho.sync
 	        //return !bError;
 	    }
 	
-	    void syncAllSources()
+	    void syncAllSources(String strQueryParams)
 	    {
 //	        boolean bError = false;
 
@@ -904,7 +896,7 @@ namespace rho.sync
 	        //TODO: do not stop on error source
 	        for( int i = 0; i < (int)m_sources.size() && isContinueSync(); i++ )
 	        {
-	            /*bError = !*/syncOneSource(i);
+                /*bError = !*/syncOneSource(i, strQueryParams);
 	        }
 
             if (!isSchemaChanged() && getState() != SyncEngine.esStop )
@@ -975,9 +967,12 @@ namespace rho.sync
 		        RHOCONF().setString("rho_sync_user", name, true);
 		    
 	    	    getNotify().callLoginCallback(oNotify, RhoAppAdapter.ERR_NONE, "" );
-		    
-	    	    if ( ClientRegister.getInstance() != null )
-	    		    ClientRegister.getInstance().startUp();	    	
+
+                if (ClientRegister.getInstance() != null)
+                {
+                    getUserDB().executeSQL("UPDATE client_info SET token_sent=?", 0);
+                    ClientRegister.getInstance().startUp();
+                }    	
 	    	
 		    }catch(Exception exc)
 		    {

data/platform/wp7/RhoRubyLib/sync/SyncNotify.cs

@@ -9,6 +9,7 @@ namespace rho.sync
     {
         private static RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
 		    new RhoLogger("Sync");
+        int MAX_SERVER_ERROR_LEN = 1000;
         private static CRhodesApp RHODESAPP() { return CRhodesApp.Instance; }
 
         public class SyncNotification
@@ -505,17 +506,32 @@ namespace rho.sync
 				        	
 				        	    strBody += "error";				        	
 						        strBody += "&error_code=" + nErrCode;
-						    
-						        if ( strError != null && strError.length() > 0 )
-						    	    strBody += "&error_message=" + URI.urlEncode(strError);
-						        else  if ( src != null )
-						    	    strBody += "&error_message=" + URI.urlEncode(src.m_strError);
-						    
-						        if ( strServerError != null && strServerError.length() > 0 )
-						    	    strBody += "&" + strServerError;
-						        else if ( src != null && src.m_strServerError != null && src.m_strServerError.length() > 0  )
-						    	    strBody += "&" + src.m_strServerError;						    
-				            }
+
+                                if (strError != null && strError.length() > 0)
+                                {
+                                    if (strError.length() > MAX_SERVER_ERROR_LEN)
+                                        strError = strError.substring(0, MAX_SERVER_ERROR_LEN);
+                                    strBody += "&error_message=" + URI.urlEncode(strError);
+                                }
+                                else if (src != null && src.m_strError != null)
+                                {
+                                    if (src.m_strError.length() > MAX_SERVER_ERROR_LEN)
+                                        src.m_strError = src.m_strError.substring(0, MAX_SERVER_ERROR_LEN);
+                                    strBody += "&error_message=" + URI.urlEncode(src.m_strError);
+                                }
+
+                                if (strServerError != null && strServerError.length() > 0)
+                                {
+                                    if (strServerError.length() > MAX_SERVER_ERROR_LEN)
+                                        strServerError = strServerError.substring(0, MAX_SERVER_ERROR_LEN);
+                                    strBody += "&" + strServerError;
+                                }
+                                else if (src != null && src.m_strServerError != null && src.m_strServerError.length() > 0)                              
+                                {
+                                    if ( src.m_strServerError.length() > MAX_SERVER_ERROR_LEN )
+                                        src.m_strServerError = src.m_strServerError.substring(0, MAX_SERVER_ERROR_LEN);	
+                                    strBody += "&" + src.m_strServerError;	                }						    
+				                }
 				        
 		                    if ( src != null )
 		                        strBody += makeCreateObjectErrorBody( src.getID());
@@ -636,6 +652,10 @@ namespace rho.sync
 				    return;
 			
 		        String strBody = "error_code=" + nErrCode;
+
+                if (strMessage != null && strMessage.length() > MAX_SERVER_ERROR_LEN)
+                    strMessage = strMessage.substring(0, MAX_SERVER_ERROR_LEN);
+
 	            strBody += "&error_message=" + URI.urlEncode(strMessage != null? strMessage : "");
 	            strBody += "&rho_callback=1";
 	        

data/platform/wp7/RhoRubyLib/sync/SyncProtocol_3.cs

@@ -45,7 +45,12 @@ namespace rho.sync
 
         public String getClientResetUrl(String strClientID)
         {
-            return RhoConf.getInstance().getPath("syncserver") + "clientreset?client_id=" + strClientID;
+            String strUrl = RhoConf.getInstance().getPath("syncserver") + "clientreset?client_id=" + strClientID;
+            String strSources = RhoConf.getInstance().getString("reset_models");
+            if ( strSources.length() > 0 )
+                strUrl += strSources;
+
+            return strUrl;
         }
 
         public String getClientChangesUrl()

data/platform/wp7/RhoRubyLib/sync/SyncSource.cs

@@ -46,6 +46,7 @@ namespace rho.sync
         boolean m_bGetAtLeastOnePage = false;
         public int m_nErrCode = RhoAppAdapter.ERR_NONE;
         public String m_strError = "", m_strServerError = "";
+        public String m_strQueryParams = "";
     
         int m_nRefreshTime = 0;
         int m_nProgressStep = 0;
@@ -567,6 +568,9 @@ namespace rho.sync
 	            if ( !m_bTokenFromDB && getToken() > 1 )
 	                strQuery += "&token=" + getToken();
 
+                if (m_strQueryParams.length() > 0)
+                    strQuery += "&" + m_strQueryParams;
+
 			    LOG.INFO( "Pull changes from server. Url: " + (strUrl+strQuery) );
 			
 			    NetResponse resp = null;

data/platform/wp7/RhoRubyLib/sync/SyncThread.cs

@@ -18,34 +18,38 @@ namespace rho.sync
    	    {
    		    public int m_nCmdCode;
    		    public int m_nCmdParam;
-   		    public String m_strCmdParam;
+            public String m_strCmdParam, m_strQueryParams;
    		    public boolean m_bShowStatus;
-   		
-   		    public SyncCommand(int nCode, int nParam, boolean bShowStatus)
+
+            public SyncCommand(int nCode, int nParam, boolean bShowStatus, String query_params)
    		    {
    			    m_nCmdCode = nCode;
    			    m_nCmdParam = nParam;
    			    m_bShowStatus = bShowStatus;
+                m_strQueryParams = query_params != null ? query_params : "";
    		    }
-   		    public SyncCommand(int nCode, String strParam, boolean bShowStatus)
+            public SyncCommand(int nCode, String strParam, boolean bShowStatus, String query_params)
    		    {
    			    m_nCmdCode = nCode;
    			    m_strCmdParam = strParam;
    			    m_bShowStatus = bShowStatus;
+                m_strQueryParams = query_params != null ? query_params : "";
    		    }
-	        public SyncCommand(int nCode, String strParam, int nCmdParam, boolean bShowStatus)
+            public SyncCommand(int nCode, String strParam, int nCmdParam, boolean bShowStatus, String query_params)
 	        {
 		        m_nCmdCode = nCode;
 		        m_strCmdParam = strParam;
                 m_nCmdParam = nCmdParam;
                 m_bShowStatus = bShowStatus;
+                m_strQueryParams = query_params != null ? query_params : "";
 	        }
-   		
-   		    public SyncCommand(int nCode, boolean bShowStatus)
+
+            public SyncCommand(int nCode, boolean bShowStatus, String query_params)
    		    {
    			    m_nCmdCode = nCode;
    			    m_nCmdParam = 0;
    			    m_bShowStatus = bShowStatus;
+                m_strQueryParams = query_params != null ? query_params : "";
    		    }
    		
    		    public boolean equals(IQueueCommand obj)
@@ -53,7 +57,9 @@ namespace rho.sync
    			    SyncCommand oSyncCmd = (SyncCommand)obj;
    			    return m_nCmdCode == oSyncCmd.m_nCmdCode && m_nCmdParam == oSyncCmd.m_nCmdParam &&
    				    (m_strCmdParam == oSyncCmd.m_strCmdParam ||
-   				    (m_strCmdParam != null && oSyncCmd.m_strCmdParam != null && m_strCmdParam.equals(oSyncCmd.m_strCmdParam)));  		
+                    (m_strCmdParam != null && oSyncCmd.m_strCmdParam != null && m_strCmdParam.equals(oSyncCmd.m_strCmdParam))) &&
+                    (m_strQueryParams == oSyncCmd.m_strQueryParams ||
+                    (m_strQueryParams != null && oSyncCmd.m_strQueryParams != null && m_strQueryParams.equals(oSyncCmd.m_strQueryParams)));
    		    }
    		
    		    public String toString()
@@ -85,7 +91,7 @@ namespace rho.sync
    		    public String m_strName, m_strPassword;
    		    public /*common::CAutoPtr<C*/SyncNotify.SyncNotification/*>*/ m_pNotify;
    		    public SyncLoginCommand(String name, String password, String callback, SyncNotify.SyncNotification pNotify) :
-                base(scLogin,callback,false)
+                base(scLogin, callback, false, "")
    		    {
    			    m_strName = name;
    			    m_strPassword = password;
@@ -99,7 +105,7 @@ namespace rho.sync
 	        public Vector<String> m_arSources;
 	    
             public SyncSearchCommand(String from, String _params, Vector<String> arSources, boolean sync_changes, int nProgressStep) :
-                base(scSearchOne,_params,nProgressStep, false)
+                base(scSearchOne, _params, nProgressStep, false, "")
 	        {
 		        m_strFrom = from;
 		        m_bSyncChanges = sync_changes;
@@ -199,7 +205,7 @@ namespace rho.sync
 	    public override void onTimeout()//throws Exception
 	    {
 	        if ( isNoCommands() && getPollInterval()>0 )
-	            addQueueCommandInt(new SyncCommand(scSyncAll,false));
+                addQueueCommandInt(new SyncCommand(scSyncAll, false, ""));
 	    }
 	
 	    void checkShowStatus(SyncCommand oSyncCmd)
@@ -217,12 +223,12 @@ namespace rho.sync
 	        {
 	        case scSyncAll:
 	    	    checkShowStatus(oSyncCmd);
-	            m_oSyncEngine.doSyncAllSources();
+                m_oSyncEngine.doSyncAllSources(oSyncCmd.m_strQueryParams);
 	            break;
             case scSyncOne:
 	            {
 				    checkShowStatus(oSyncCmd);
-	                m_oSyncEngine.doSyncSource(new SyncEngine.SourceID(oSyncCmd.m_nCmdParam,oSyncCmd.m_strCmdParam));
+                    m_oSyncEngine.doSyncSource(new SyncEngine.SourceID(oSyncCmd.m_nCmdParam, oSyncCmd.m_strCmdParam), oSyncCmd.m_strQueryParams);
 	            }
 	            break;
 	        
@@ -266,7 +272,7 @@ namespace rho.sync
 	
 	    public static void doSyncAllSources(boolean bShowStatus)
 	    {
-		    getInstance().addQueueCommand(new SyncCommand(SyncThread.scSyncAll,bShowStatus));
+            getInstance().addQueueCommand(new SyncCommand(SyncThread.scSyncAll, bShowStatus, ""));
 	    }
 	
 	    public static void doSyncSourceByName(String strSrcName, boolean bShowStatus)
@@ -274,7 +280,7 @@ namespace rho.sync
 		    if (bShowStatus&&(m_statusListener != null)) {
 			    m_statusListener.createStatusPopup(RhoAppAdapter.getMessageText("syncronizing_data"));
 		    }
-	        getInstance().addQueueCommand(new SyncCommand(SyncThread.scSyncOne, strSrcName, (int)0, bShowStatus ) );		
+            getInstance().addQueueCommand(new SyncCommand(SyncThread.scSyncOne, strSrcName, (int)0, bShowStatus, ""));		
 	    }
 	
 	    public static void stopSync()

data/platform/wp7/build/wp.rake

@@ -417,6 +417,12 @@ namespace "run" do
                 $rhosim_config = "platform='wp'\r\n"
                 Rake::Task["run:rhosimulator_debug"].invoke            
             end
+
+			task :phone_spec do
+				Jake.run_spec_app('wp','phone_spec')
+				exit 1 if $total.to_i==0
+				exit $failed.to_i
+			end
             
 			desc "Build, install .xap and run on WP7 device"
 			task :device => ["device:wp:production_noxap"] do

data/rakefile.rb

@@ -80,7 +80,7 @@ namespace "framework" do
 end
 
 
-$application_build_configs_keys = ['security_token', 'encrypt_database', 'android_title']
+$application_build_configs_keys = ['security_token', 'encrypt_database', 'android_title', 'iphone_use_doc_folder', 'iphone_all_in_doc_folder']
 
 def make_application_build_config_header_file
   f = StringIO.new("", "w+")      
@@ -1219,6 +1219,7 @@ namespace "run" do
         end
 
         sim_conf = "rhodes_path='#{$startdir}'\r\n"
+        sim_conf += "app_version='#{$app_config["version"]}'\r\n"
         sim_conf += "app_name='#{$appname}'\r\n"
         if ( ENV['rho_reload_app_changes'] )
             sim_conf += "reload_app_changes=#{ENV['rho_reload_app_changes']}\r\n"        

data/res/generators/templates/spec/app/SpecRunner/index.erb

@@ -1,14 +1,15 @@
-<div class="toolbar">
-	<h1 id="pageTitle">
-		SpecRunner
-	</h1>
+<div data-role="page">
+  <div data-role="header">
+    <h1>SpecRunner</h1>
+    <a href="#" data-rel="back" data-icon="back">Back</a>
+  </div>
+  <%@color = @code == 0 ? "#00ff00" : "#ff0000"%>
+  <div data-role="content">
+    <ul data-role="listview">
+        <% if @msg %><li style="color:<%=@color%>" align="center"><%=@msg%></li><% end %>
+        <li style="color:<%=@color%>">Total: <%=@count%></li>
+        <li style="color:<%=@color%>">Passed: <%=@count - @exc_count%></li>
+        <li style="color:<%=@color%>">Failed: <%=@exc_count%></li>
+    </ul>
+  </div>
 </div>
-
-<%@color = @code == 0 ? "#00ff00" : "#ff0000"%>
-
-<ul id="specrunner" title="SpecRunner" selected="true">
-	<% if @msg %><li style="color:<%=@color%>" align="center"><%=@msg%></li><% end %>
-    <li style="color:<%=@color%>">Total: <%=@count%></li>
-    <li style="color:<%=@color%>">Passed: <%=@count - @exc_count%></li>
-    <li style="color:<%=@color%>">Failed: <%=@exc_count%></li>
-</ul>

data/spec/phone_spec/app/spec/rhom_object_spec.rb

@@ -1288,14 +1288,23 @@ if !defined?(RHO_WP7)
     f.close        
 
     File.exists?(file_name).should == true
+
     blob_name = file_name[__rhoGetCurrentDir().length(), file_name.length()-__rhoGetCurrentDir().length()]
-    #puts "blob_name : #{blob_name}"
+      
+    if System::get_property('platform') == 'APPLE'
+        blob_name = file_name[__rhoGetUserDir().length(), file_name.length()-__rhoGetUserDir().length()]
+    end
+    
+    puts "file_name : #{file_name}"
+    puts "blob_name : #{blob_name}"
     
     item = getAccount.create({'my_text'=>blob_name})
     item.my_text.should == blob_name
     File.exists?(file_name).should == true
     
     item.destroy
+      
+      #sleep 30  
     
     item2 = getAccount.find(item.object)
     item2.should be_nil