rhodes 2.1.0 → 2.2.0.beta.1

data/platform/android/build/librhodes_build.files

@@ -1,9 +1,10 @@
 platform/android/Rhodes/jni/src/RhoClassFactory.cpp
 platform/android/Rhodes/jni/src/alert.cpp
+platform/android/Rhodes/jni/src/bluetooth.cpp
 platform/android/Rhodes/jni/src/callbacks.cpp
 platform/android/Rhodes/jni/src/camera.cpp
-platform/android/Rhodes/jni/src/signature.cpp
 platform/android/Rhodes/jni/src/datetimepicker.cpp
+platform/android/Rhodes/jni/src/event.cpp
 platform/android/Rhodes/jni/src/fileapi.cpp
 platform/android/Rhodes/jni/src/geolocation.cpp
 platform/android/Rhodes/jni/src/logconf.cpp
@@ -17,6 +18,7 @@ platform/android/Rhodes/jni/src/phonebook.cpp
 platform/android/Rhodes/jni/src/rhoconf.cpp
 platform/android/Rhodes/jni/src/rhodes.cpp
 platform/android/Rhodes/jni/src/ringtones.cpp
+platform/android/Rhodes/jni/src/signature.cpp
 platform/android/Rhodes/jni/src/socketimpl.cpp
 platform/android/Rhodes/jni/src/splashscreen.cpp
 platform/android/Rhodes/jni/src/sslimpl.cpp

data/platform/android/build/libruby_build.files

@@ -21,8 +21,10 @@ platform/shared/ruby/error.c
 platform/shared/ruby/eval.c
 platform/shared/ruby/ext/alert/alert_wrap.c
 platform/shared/ruby/ext/asynchttp/asynchttp_wrap.c
+platform/shared/ruby/ext/bluetooth/bluetooth_wrap.c
+platform/shared/ruby/ext/calendar/calendar_wrap.c
+platform/shared/ruby/ext/calendar/event_wrap.c
 platform/shared/ruby/ext/camera/camera_wrap.c
-platform/shared/ruby/ext/signature/signature_wrap.c
 platform/shared/ruby/ext/datetimepicker/datetimepicker_wrap.c
 platform/shared/ruby/ext/geolocation/geolocation_wrap.c
 platform/shared/ruby/ext/mapview/mapview_wrap.c
@@ -34,6 +36,7 @@ platform/shared/ruby/ext/rho/rhoruby.c
 platform/shared/ruby/ext/rho/rhosupport.c
 platform/shared/ruby/ext/rhoconf/rhoconf_wrap.c
 platform/shared/ruby/ext/ringtones/ringtones_wrap.c
+platform/shared/ruby/ext/signature/signature_wrap.c
 platform/shared/ruby/ext/socket/socket.c
 platform/shared/ruby/ext/sqlite3_api/sqlite3_api_wrap.c
 platform/shared/ruby/ext/stringio/stringio.c

data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBResult.java

@@ -47,7 +47,7 @@ public class HsqlDBResult implements IDBResult
 	public String getColName(int nCol){
 		Result.ResultMetaData md = m_result.metaData;
 		if ( md.tableNames[nCol] != null && md.tableNames[nCol].length() > 0 )
-			return md.colNames[nCol].toLowerCase();
+			return md.colNames[nCol];//.toLowerCase();
 
 		//AS alias
 		return md.colNames[nCol];
@@ -60,7 +60,7 @@ public class HsqlDBResult implements IDBResult
 			if ( md.colOrigNames[nCol] != null )
 				return md.colOrigNames[nCol];
 			
-			return md.colNames[nCol].toLowerCase();
+			return md.colNames[nCol];//.toLowerCase();
 		}
 		
 		//AS alias

data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBRowResult.java

@@ -26,7 +26,7 @@ public class HsqlDBRowResult extends HsqlDBResult {
 	
 	public String getColName(int nCol){
 		Object col = m_table.columnList.get(nCol);
-		return ((Column)col).columnName.name.toLowerCase();
+		return ((Column)col).columnName.name;//.toLowerCase();
 	}
 
 	//Object[] getItem(int nItem){

data/platform/bb/Hsqldb/src/org/hsqldb/Expression.java

@@ -1960,7 +1960,9 @@ public class Expression {
                 if (tableName == null || tableName.equals(filterName)) {
                     Table table = f.getTable();
                     int   i     = table.findColumn(columnName);
-
+                    if (i == -1)
+                    	i = table.findColumn(columnNameOrig);
+                    
                     if (i != -1) {
                         tableFilter = f;
                         columnIndex = i;
@@ -2484,9 +2486,10 @@ public class Expression {
         String likeStr = isRightArgFixedConstant
                          ? (String) eArg2.getValue(session, Types.VARCHAR)
                          : null;
-        boolean ignoreCase = eArg.dataType == Types.VARCHAR_IGNORECASE
-                             || eArg2.dataType == Types.VARCHAR_IGNORECASE;
-
+        //RHO
+        //boolean ignoreCase = eArg.dataType == Types.VARCHAR_IGNORECASE
+        //                     || eArg2.dataType == Types.VARCHAR_IGNORECASE;
+        boolean ignoreCase = true;                  
         likeObject.setParams(session, likeStr, ignoreCase);
 
         if (!isRightArgFixedConstant) {

data/platform/bb/Hsqldb/src/org/hsqldb/Like.java

@@ -85,7 +85,7 @@ class Like {
     private char[]   cLike;
     private int[]    wildCardType;
     private int      iLen;
-    private boolean  isIgnoreCase;
+    private boolean  isIgnoreCase = true;
     private int      iFirstWildCard;
     private boolean  isNull;
     Character        escapeChar;
@@ -96,7 +96,7 @@ class Like {
 
     Like(Character escape, boolean collation) {
         escapeChar   = escape;
-        hasCollation = collation;
+        hasCollation = true;//collation;
     }
 
     /**
@@ -107,7 +107,7 @@ class Like {
      */
     void setParams(Session session, String s, boolean ignorecase) {
 
-        isIgnoreCase = ignorecase;
+        //isIgnoreCase = ignorecase;
 
         normalize(session, s);
 

data/platform/bb/Hsqldb/src/org/hsqldb/Table.java

@@ -1067,7 +1067,9 @@ public class Table extends BaseTable {
     int getColumnNr(String c) throws HsqlException {
 
         int i = findColumn(c);
-
+        if (i == -1)
+        	i = findColumn(c.toLowerCase());
+        
         if (i == -1) {
             throw Trace.error(Trace.COLUMN_NOT_FOUND, c);
         }

data/platform/bb/Hsqldb/src/org/hsqldb/Tokenizer.java

@@ -873,7 +873,7 @@ public class Tokenizer {
 
                     iIndex++;
 
-                    sToken = getString('"').toUpperCase();
+                    sToken = getString('"');//.toUpperCase();
 
                     if (iIndex == sCommand.length()) {
                         return;

data/platform/bb/RubyVM/RubyVM.jdp

@@ -38,6 +38,7 @@ src\com\rho\IRhoLogSink.java
 src\com\rho\IRhoRubyHelper.java
 src\com\rho\Mutex.java
 src\com\rho\RhodesApp.java
+platform\bb\RubyVM\src\com\rho\RhoAppAdapter.java
 src\com\rho\SplashScreen.java
 src\com\rho\net\IHttpConnection.java
 src\com\rho\net\INetworkAccess.java

data/platform/bb/RubyVM/src/com/rho/RhoConf.java

@@ -5,7 +5,7 @@ import java.util.Enumeration;
 import java.util.Hashtable;
 
 import com.rho.net.NetResponse;
-import com.xruby.runtime.builtin.ObjectFactory;
+import com.xruby.runtime.builtin.*;
 import com.xruby.runtime.lang.*;
 import com.rho.net.NetRequest.MultipartItem;
 import com.rho.file.SimpleFile;
@@ -275,6 +275,75 @@ public class RhoConf {
 		}
    }
    
+   private static long readToBuffer(java.io.InputStream is, byte[] buf, StringBuffer res, long limit)throws Exception
+   {
+	   long nTotal = 0;
+	   while(nTotal < limit)
+	   {
+			long nRead = is.read(buf);
+			if ( nRead < 0 )
+				break;
+			if ( nTotal + nRead > limit )
+				nRead = limit - nTotal; 
+					
+			nTotal += nRead; 
+			res.append(new String(buf,0,(int)nRead));
+	   }
+	   
+	   return nTotal;
+   }
+   
+   static RubyString getLogText_ruby(long limit)throws Exception
+	{
+		StringBuffer res = new StringBuffer(); 
+    	SimpleFile oFile = null;
+    	RhoLogConf logConf = RhoLogger.getLogConf();
+	    boolean bOldSaveToFile = logConf.isLogToFile();
+	    logConf.setLogToFile(false);
+	    java.io.InputStream is = null;
+    	try{
+	        oFile = RhoClassFactory.createFile();
+	        oFile.open( logConf.getLogFilePath(), true, false);
+	        
+	        if ( oFile.isOpened() )
+	        {
+	            long nFileSize = oFile.length();
+	            long nPos = logConf.getLogTextPos();
+	            long nMaxSize = nFileSize > nPos ? nFileSize : nPos; 
+	            if ( limit <= 0 || limit > nMaxSize)
+	                limit = nMaxSize;
+
+	            res = new StringBuffer((int)limit);
+	            is = oFile.getInputStream();
+	            byte[] buf = new byte[8096];
+	            if ( limit <= nPos )
+	            {
+	                is.skip(nPos-limit);
+	                readToBuffer(is, buf, res, limit);
+	            }else
+	            {
+	            	is.skip(nFileSize-(limit-nPos));
+	                long nRead = readToBuffer(is, buf, res, limit);
+	                
+	                oFile.close();
+	                oFile.open( logConf.getLogFilePath(), true, false);
+	                is = oFile.getInputStream();
+	                readToBuffer(is, buf, res, limit-nRead);
+	            }
+	            
+	        }
+	        
+    	}finally
+    	{
+    		if ( oFile != null )
+    			try{ oFile.close(); }catch(IOException exc2){}
+    		
+    		logConf.setLogToFile(bOldSaveToFile);
+    	}
+		
+		return ObjectFactory.createString(res);
+	}
+   
    public static boolean sendLog()
    {
 		com.rho.net.NetRequest nq = RhoClassFactory.createNetRequest();
@@ -398,6 +467,44 @@ public class RhoConf {
 			    
 			}
 		});
+
+		klass.getSingletonClass().defineMethod("clean_log",	new RubyNoArgMethod() {
+			protected RubyValue run(RubyValue receiver, RubyBlock block) {
+				try{
+					RhoLogger.clearLog();
+					return RubyConstant.QNIL;
+				}catch(Exception e)
+				{
+					LOG.ERROR("clean_log failed", e);
+					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+				}
+			    
+			}
+		});
+
+		klass.getSingletonClass().defineMethod("read_log",	new RubyNoOrOneArgMethod() {
+			protected RubyValue run(RubyValue receiver, RubyBlock block) {
+				try{
+					return getLogText_ruby(0);
+				}catch(Exception e)
+				{
+					LOG.ERROR("read_log failed", e);
+					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+				}
+			    
+			}
+			
+			protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block) {
+				try{
+					return getLogText_ruby(arg.toInt());
+				}catch(Exception e)
+				{
+					LOG.ERROR("read_log failed", e);
+					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+				}
+			    
+			}
+		});
 		
 	}
 }

data/platform/bb/RubyVM/src/com/rho/RhoLogConf.java

@@ -126,6 +126,9 @@ public class RhoLogConf {
 	public String getLogText(){
 		String res = "";
     	SimpleFile oFile = null;
+	    boolean bOldSaveToFile = isLogToFile();
+	    setLogToFile(false);
+    	
     	try{
 	        oFile = RhoClassFactory.createFile();
 	        oFile.open( getLogFilePath(), true, false);
@@ -138,9 +141,12 @@ public class RhoLogConf {
     	}catch(Exception exc){
     		if ( oFile != null )
     			try{ oFile.close(); }catch(IOException exc2){}
+    	}finally
+    	{
+    		setLogToFile(bOldSaveToFile);
     	}
 		
 		return res;
 	}
-    
+
 }

data/platform/bb/RubyVM/src/com/rho/RhoRuby.java

@@ -117,7 +117,7 @@ public class RhoRuby {
 		return null;
 	}
 
-	public static RubyValue processIndexRequest(String strIndexArg ){
+	public static RubyValue processIndexRequest(String strIndexArg, RubyValue hashReq ){
 		
 		String strIndex = strIndexArg.replace('\\', '/');
 /*		int nAppsIndex = strIndex.indexOf("/apps/");
@@ -127,7 +127,8 @@ public class RhoRuby {
 				RhoSupport.setCurAppPath( strIndex.substring(nAppsIndex, endIndex+1));
 		}*/
 		
-		RubyValue value = RubyAPI.callPublicOneArgMethod(receiver, ObjectFactory.createString(strIndex), null, serveIndexID);
+		RubyValue value = RubyAPI.callPublicTwoArgMethod(receiver, 
+				ObjectFactory.createString(strIndex), hashReq, null, serveIndexID);
 		
 		return value;
 	}
@@ -152,7 +153,9 @@ public class RhoRuby {
 		//return value.toString();
 	}
 	
-	public static RubyValue processRequest(Properties reqHash, Properties reqHeaders, Properties resHeaders )throws IOException{
+	public static RubyValue processRequest(Properties reqHash, 
+			Properties reqHeaders, Properties resHeaders, String strIndex )throws IOException
+	{
 		RubyHash rh = ObjectFactory.createHash();
 		for( int i = 0; i < reqHash.size(); i++ ){
 			if ( reqHash.getValueAt(i) != null)
@@ -174,7 +177,7 @@ public class RhoRuby {
 		
 		addHashToHash( rh, "headers", headers );
 		
-		RubyValue res = callFramework(rh); 
+		RubyValue res = strIndex != null? processIndexRequest(strIndex, rh) : callFramework(rh); 
 		return res; 
 	}
 	

data/platform/bb/RubyVM/src/com/rho/ThreadQueue.java

@@ -20,6 +20,7 @@ public abstract class ThreadQueue extends RhoThread
     {
         public abstract boolean equals(IQueueCommand cmd);
         public abstract String toString();
+        public abstract void execute();
     };
 
     RhoClassFactory m_ptrFactory;
@@ -37,7 +38,7 @@ public abstract class ThreadQueue extends RhoThread
     public RhoClassFactory getFactory(){ return m_ptrFactory; }
 
     int getLastPollInterval(){ return 0;}
-    public abstract void processCommand(IQueueCommand pCmd);
+    //public abstract void processCommand(IQueueCommand pCmd);
     boolean isSkipDuplicateCmd() { return false; }
 
     public ThreadQueue(RhoClassFactory factory)
@@ -135,6 +136,11 @@ public abstract class ThreadQueue extends RhoThread
 	    }
     }
 
+    public void processCommand(IQueueCommand pCmd)
+    {
+    	pCmd.execute();
+    }
+    
     public void setPollInterval(int nInterval)
     { 
         m_nPollInterval = nInterval; 

data/platform/bb/RubyVM/src/com/rho/net/AsyncHttp.java

@@ -155,7 +155,7 @@ public class AsyncHttp extends ThreadQueue
     	    m_valBody = RhoRuby.create_string(resp.getCharData());
     	}
         
-        void execute()
+        public void execute()
         {
             NetResponse resp = null;
      	    try

data/platform/bb/RubyVM/src/com/rho/net/NetRequest.java

@@ -125,6 +125,17 @@ public class NetRequest
 		return "";
 	}
 	
+	void handleCookie(IRhoSession oSession) throws Exception
+	{
+		if ( oSession != null )
+		{
+			String strSession = oSession.getSession();
+			LOG.INFO("Cookie : " + (strSession != null ? strSession : "") );
+			if ( strSession != null && strSession.length() > 0 && !strSession.equals("rho_empty") )
+				m_connection.setRequestProperty("Cookie", strSession );
+		}
+	}
+	
 	public NetResponse doRequest(String strMethod, String strUrl, String strBody, IRhoSession oSession, Hashtable headers ) throws Exception
     {
 		String strRespBody = null;
@@ -138,14 +149,7 @@ public class NetRequest
 			m_connection = RhoClassFactory.getNetworkAccess().connect(strUrl, m_bIgnoreSuffixOnSim);
 			LOG.INFO("connection done");
 			
-			if ( oSession != null )
-			{
-				String strSession = oSession.getSession();
-				LOG.INFO("Cookie : " + (strSession != null ? strSession : "") );
-				if ( strSession != null && strSession.length() > 0 )
-					m_connection.setRequestProperty("Cookie", strSession );
-			}
-			
+			handleCookie(oSession);
 			//m_connection.setRequestProperty("Connection", "keep-alive");
 			//m_connection.setRequestProperty("Accept", "application/x-www-form-urlencoded,application/json,text/html");
 			
@@ -256,7 +260,11 @@ public class NetRequest
 		NetResponse resp = doRequest/*Try*/("POST", strUrl, strBody, oSession, headers);
 		if ( resp.isOK() )
 		{
-			resp.setCharData(resp.getCookies());
+			String strCookie = resp.getCookies();
+			if ( strCookie == null || strCookie.length() == 0 )
+				strCookie = "rho_empty";
+			
+			resp.setCharData(strCookie);
 			LOG.INFO("pullCookies: " + resp.getCharData() );
 		}
 		
@@ -341,13 +349,8 @@ public class NetRequest
 			closeConnection();
 			m_connection = RhoClassFactory.getNetworkAccess().connect(strUrl, false);
 			
-			if ( oSession != null )
-			{
-				String strSession = oSession.getSession();
-				if ( strSession != null && strSession.length() > 0 )
-					m_connection.setRequestProperty("Cookie", strSession );
-			}
-			
+			handleCookie(oSession);
+
 			m_connection.setRequestProperty("Connection", "keep-alive");
 			m_connection.setRequestProperty("content-type", szMultipartContType);
 			writeHeaders(headers);
@@ -502,13 +505,8 @@ public class NetRequest
 			closeConnection();
 			m_connection = RhoClassFactory.getNetworkAccess().connect(strUrl, true);
 			
-			if (oSession!= null)
-			{
-				String strSession = oSession.getSession();
-				if ( strSession != null && strSession.length() > 0 )
-					m_connection.setRequestProperty("Cookie", strSession );
-			}
-			
+			handleCookie(oSession);
+
 			m_connection.setRequestProperty("Connection", "keep-alive");
 			
 			if ( nStartPos > 0 || m_nMaxPacketSize > 0 )