rhodes 1.5.5 → 2.0.0.beta1

data/platform/shared/ruby/ext/webview/webview.i

@@ -1,18 +1,22 @@
 /* webview.i */
 %module WebView
 %{
-extern void webview_refresh(int index);
-#define refresh webview_refresh 
-extern void webview_navigate(char* url, int index);
-#define navigate webview_navigate
-extern char* webview_current_location(int index);
-#define current_location webview_current_location
-extern char* webview_execute_js(char* js, int index);
-#define execute_js webview_execute_js
-extern void webview_set_menu_items(VALUE argv);
-#define set_menu_items webview_set_menu_items
-extern int webview_active_tab();
-#define active_tab webview_active_tab
+extern void rho_webview_refresh(int index);
+#define refresh rho_webview_refresh 
+extern void rho_webview_navigate(const char* url, int index);
+#define navigate rho_webview_navigate
+extern char* rho_webview_current_location(int index);
+#define current_location rho_webview_current_location
+extern char* rho_webview_execute_js(const char* js, int index);
+#define execute_js rho_webview_execute_js
+extern void rho_webview_set_menu_items(VALUE argv);
+#define set_menu_items rho_webview_set_menu_items
+extern int rho_webview_active_tab();
+#define active_tab rho_webview_active_tab
+
+extern void rho_webview_full_screen_mode(int enable);
+#define full_screen_mode rho_webview_full_screen_mode
+
 %}
 
 %typemap(default) int index {
@@ -20,8 +24,9 @@ extern int webview_active_tab();
 }
 
 extern void refresh(int index);
-extern void navigate(char* url, int index);
-extern char* current_location(int index);
-extern char* execute_js(char* js, int index);
+extern void navigate(const char* url, int index);
+extern const char* current_location(int index);
+extern const char* execute_js(const char* js, int index);
 extern void set_menu_items(VALUE argv);
 extern int active_tab();
+extern void full_screen_mode(int enable);

data/platform/shared/ruby/ext/webview/webview_wrap.c

@@ -1545,18 +1545,22 @@ static VALUE mWebView;
 #define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),(void**)(a)) 
 
 
-extern void webview_refresh(int index);
-#define refresh webview_refresh 
-extern void webview_navigate(char* url, int index);
-#define navigate webview_navigate
-extern char* webview_current_location(int index);
-#define current_location webview_current_location
-extern char* webview_execute_js(char* js, int index);
-#define execute_js webview_execute_js
-extern void webview_set_menu_items(VALUE argv);
-#define set_menu_items webview_set_menu_items
-extern int webview_active_tab();
-#define active_tab webview_active_tab
+extern void rho_webview_refresh(int index);
+#define refresh rho_webview_refresh 
+extern void rho_webview_navigate(const char* url, int index);
+#define navigate rho_webview_navigate
+extern char* rho_webview_current_location(int index);
+#define current_location rho_webview_current_location
+extern char* rho_webview_execute_js(const char* js, int index);
+#define execute_js rho_webview_execute_js
+extern void rho_webview_set_menu_items(VALUE argv);
+#define set_menu_items rho_webview_set_menu_items
+extern int rho_webview_active_tab();
+#define active_tab rho_webview_active_tab
+
+extern void rho_webview_full_screen_mode(int enable);
+#define full_screen_mode rho_webview_full_screen_mode
+
 
 
 #include <limits.h>
@@ -1754,7 +1758,7 @@ _wrap_navigate(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "navigate" "', argument " "1"" of type '" "char *""'");
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "navigate" "', argument " "1"" of type '" "char const *""'");
   }
   arg1 = (char *)(buf1);
   if (argc > 1) {
@@ -1764,7 +1768,7 @@ _wrap_navigate(int argc, VALUE *argv, VALUE self) {
     } 
     arg2 = (int)(val2);
   }
-  navigate(arg1,arg2);
+  navigate((char const *)arg1,arg2);
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   return Qnil;
 fail:
@@ -1822,7 +1826,7 @@ _wrap_execute_js(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "execute_js" "', argument " "1"" of type '" "char *""'");
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "execute_js" "', argument " "1"" of type '" "char const *""'");
   }
   arg1 = (char *)(buf1);
   if (argc > 1) {
@@ -1832,7 +1836,7 @@ _wrap_execute_js(int argc, VALUE *argv, VALUE self) {
     } 
     arg2 = (int)(val2);
   }
-  result = (char *)execute_js(arg1,arg2);
+  result = (char *)execute_js((char const *)arg1,arg2);
   vresult = SWIG_FromCharPtr((const char *)result);
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   return vresult;
@@ -1873,6 +1877,27 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_full_screen_mode(int argc, VALUE *argv, VALUE self) {
+  int arg1 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  ecode1 = SWIG_AsVal_int(argv[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "full_screen_mode" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = (int)(val1);
+  full_screen_mode(arg1);
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
@@ -2141,5 +2166,6 @@ SWIGEXPORT void Init_WebView(void) {
   rb_define_module_function(mWebView, "execute_js", _wrap_execute_js, -1);
   rb_define_module_function(mWebView, "set_menu_items", _wrap_set_menu_items, -1);
   rb_define_module_function(mWebView, "active_tab", _wrap_active_tab, -1);
+  rb_define_module_function(mWebView, "full_screen_mode", _wrap_full_screen_mode, -1);
 }
 

data/platform/shared/ruby/thread_pthread.c

@@ -17,8 +17,8 @@
 #include <sys/resource.h>
 #endif
 
-void native_mutex_lock(pthread_mutex_t *lock);
-void native_mutex_unlock(pthread_mutex_t *lock);
+/*static*/ void native_mutex_lock(pthread_mutex_t *lock);
+/*static*/ void native_mutex_unlock(pthread_mutex_t *lock);
 static int native_mutex_trylock(pthread_mutex_t *lock);
 void native_mutex_initialize(pthread_mutex_t *lock);
 void native_mutex_destroy(pthread_mutex_t *lock);
@@ -29,7 +29,7 @@ static void native_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex);
 static void native_cond_initialize(pthread_cond_t *cond);
 static void native_cond_destroy(pthread_cond_t *cond);
 
-void
+/*static*/ void
 native_mutex_lock(pthread_mutex_t *lock)
 {
     int r;
@@ -38,7 +38,7 @@ native_mutex_lock(pthread_mutex_t *lock)
     }
 }
 
-void
+/*static*/ void
 native_mutex_unlock(pthread_mutex_t *lock)
 {
     int r;

data/platform/shared/ruby/thread_win32.c

@@ -22,8 +22,8 @@
 
 static volatile DWORD ruby_native_thread_key = TLS_OUT_OF_INDEXES;
 
-int native_mutex_lock(rb_thread_lock_t *);
-int native_mutex_unlock(rb_thread_lock_t *);
+/*static*/ int native_mutex_lock(rb_thread_lock_t *);
+/*static*/ int native_mutex_unlock(rb_thread_lock_t *);
 static int native_mutex_trylock(rb_thread_lock_t *);
 void native_mutex_initialize(rb_thread_lock_t *);
 
@@ -251,7 +251,7 @@ native_sleep(rb_thread_t *th, struct timeval *tv)
     GVL_UNLOCK_END();
 }
 
-int
+/*static*/ int
 native_mutex_lock(rb_thread_lock_t *lock)
 {
 #if USE_WIN32_MUTEX
@@ -287,7 +287,7 @@ native_mutex_lock(rb_thread_lock_t *lock)
 #endif
 }
 
-int
+/*static*/ int
 native_mutex_unlock(rb_thread_lock_t *lock)
 {
 #if USE_WIN32_MUTEX

data/platform/shared/ruby/wince/io_wce.c

@@ -147,7 +147,6 @@ int _open(const char *path, int oflag, va_list arg)
         case _O_RDONLY:         /* read access */
                 fileaccess = GENERIC_READ;
                 fileshare = FILE_SHARE_READ;
-
                 break;
         case _O_WRONLY:         /* write access */
                 /* giving it read access as well

data/platform/shared/rubyJVM/src/com/rho/FilePath.java

@@ -22,12 +22,12 @@ public class FilePath
         return res;
     }
 
-    String changeBaseName( String szFileName )
+    public String changeBaseName( String szFileName )
     {
         int base = findLastSlash();
         if ( base >= 0 && base < m_szPath.length()-1 )
         {
-            String res = m_szPath.substring(0, base);
+            String res = m_szPath.substring(0, base+1);
             res += szFileName;
 
             return res;
@@ -51,6 +51,22 @@ public class FilePath
         return res;
     }
     
+    static public boolean isEqualBaseNames(String path1, String path2)
+    {
+        FilePath oPath1 = new FilePath(path1);
+        FilePath oPath2 = new FilePath(path2);
+
+        return oPath1.getBaseName().equalsIgnoreCase(oPath2.getBaseName());
+    }
+
+    static public String getRelativePath( String path1, String path2)
+    {
+        if ( !path1.startsWith(path2) )
+            return path1;
+
+        return path1.substring(path2.length());
+    }
+    
     int findLastSlash()
     {
         int slash = m_szPath.lastIndexOf('/');

data/platform/shared/rubyJVM/src/com/rho/IRhoRubyHelper.java

@@ -4,6 +4,7 @@ import com.rho.db.IDBStorage;
 import com.xruby.runtime.builtin.RubyArray;
 import com.xruby.runtime.lang.RubyProgram;
 import com.rho.net.NetResponse;
+import com.rho.file.*;
 
 public interface IRhoRubyHelper {
 	public abstract void initRubyExtensions();

data/platform/shared/rubyJVM/src/com/rho/Properties.java

@@ -18,6 +18,15 @@ public class Properties {
     public Properties(String[] propertyStrings) {
         initProps = propertyStrings;
     }
+    
+    public void clear()
+    {
+    	keys.removeAllElements();
+    	vals.removeAllElements();
+    	
+    	initProps = null;
+    }
+    
     private void convertInitPropsToVectors() {
         int numberOfProps;
 

data/platform/shared/rubyJVM/src/com/rho/RhoClassFactory.java

@@ -2,6 +2,7 @@ package com.rho;
 
 import com.rho.db.*;
 import com.rho.net.*;
+import com.rho.file.*;
 import java.io.IOException;
 
 public class RhoClassFactory 
@@ -11,11 +12,9 @@ public class RhoClassFactory
 	
     public static SimpleFile createFile() throws Exception 
     {
-    	LOG.INFO_OUT("createFile");    	
-    	
         Class wrapperClass;
         try {
-            wrapperClass = Class.forName("com.rho.Jsr75File");
+            wrapperClass = Class.forName("com.rho.file.Jsr75File");
         } catch (ClassNotFoundException exc) {  
         	try {
                 wrapperClass = Class.forName("com.rhomobile.rhodes.AndroidFile"); //android

data/platform/shared/rubyJVM/src/com/rho/RhoConf.java

@@ -4,13 +4,10 @@ import java.io.IOException;
 import java.util.Enumeration;
 
 import com.rho.net.NetResponse;
-import com.xruby.runtime.lang.RubyBlock;
-import com.xruby.runtime.lang.RubyClass;
-import com.xruby.runtime.lang.RubyConstant;
-import com.xruby.runtime.lang.RubyException;
-import com.xruby.runtime.lang.RubyNoArgMethod;
-import com.xruby.runtime.lang.RubyTwoArgMethod;
-import com.xruby.runtime.lang.RubyValue;
+import com.xruby.runtime.builtin.ObjectFactory;
+import com.xruby.runtime.lang.*;
+import com.rho.net.NetRequest.MultipartItem;
+import com.rho.file.SimpleFile;
 
 public class RhoConf {
     String      m_strConfFilePath = "";
@@ -149,6 +146,27 @@ public class RhoConf {
         return getInt(szName) == 0 ? false : true;
     }
 
+    public void   setString(String szName, String str, boolean bSaveToFile){
+    	m_mapValues.put(szName,str);
+    	
+    	if ( bSaveToFile )
+    		saveToFile();    	
+    }
+
+    public void   setInt(String szName, int nVal, boolean bSaveToFile){
+    	m_mapValues.put(szName,Integer.toString(nVal));
+    	
+    	if ( bSaveToFile )
+    		saveToFile();    	
+    }
+
+    public void   setBool(String szName, boolean bVal, boolean bSaveToFile){
+        setInt(szName, bVal ? 1 : 0 );
+        
+    	if ( bSaveToFile )
+    		saveToFile();    	
+    }
+    
     public void   setString(String szName, String str){
     	m_mapValues.put(szName,str);
     }
@@ -264,13 +282,21 @@ public class RhoConf {
 		String strQuery = strLogUrl + "client_log?" +
 		    "client_id=" + strClientID + "&device_pin=" + strDevicePin + "&log_name=" + RhoConf.getInstance().getString("logname");
 		
+	    MultipartItem oItem = new MultipartItem();
+	    oItem.m_strFilePath = RhoLogger.getLogConf().getLogFilePath();
+	    oItem.m_strContentType = "application/octet-stream";
+		
+	    boolean bOldSaveToFile = RhoLogger.getLogConf().isLogToFile();
+	    RhoLogger.getLogConf().setLogToFile(false);
+		
 		NetResponse resp = null;
 		try{
-			resp = nq.pushFile(strQuery, RhoLogger.getLogConf().getLogFilePath(), com.rho.sync.SyncThread.getSyncEngine(), null );
+			resp = nq.pushMultipartData(strQuery, oItem, com.rho.sync.SyncThread.getSyncEngine(), null );
 		}catch(Exception exc)
 		{
 			LOG.ERROR("send_log failed.", exc);
 		}
+		RhoLogger.getLogConf().setLogToFile(bOldSaveToFile);
 		
 		if ( resp == null || !resp.isOK() )
 		{
@@ -296,6 +322,19 @@ public class RhoConf {
 				return RubyConstant.QNIL;
 			}
 		});
+
+	   klass.getSingletonClass().defineMethod("is_property_exists", new RubyOneArgMethod() {
+			protected RubyValue run(RubyValue receiver, RubyValue arg0, RubyBlock block) {
+				try {
+					boolean bRes = RhoConf.getInstance().isExist(arg0.toString());
+					
+					return ObjectFactory.createBoolean(bRes);
+				} catch (Exception e) {
+					LOG.ERROR("is_property_exists failed", e);
+					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+				}
+			}
+		});
 	   
 		klass.getSingletonClass().defineMethod("show_log",	new RubyNoArgMethod() {
 			protected RubyValue run(RubyValue receiver, RubyBlock block) {

data/platform/shared/rubyJVM/src/com/rho/RhoLogConf.java

@@ -1,6 +1,7 @@
 package com.rho;
 
 import java.io.IOException;
+import com.rho.file.SimpleFile;
 
 public class RhoLogConf {
     int         m_nMinSeverity = 0;

data/platform/shared/rubyJVM/src/com/rho/RhoLogFileSink.java

@@ -1,6 +1,7 @@
 package com.rho;
 
 import java.io.IOException;
+import com.rho.file.SimpleFile;
 
 public class RhoLogFileSink implements IRhoLogSink{
 

data/platform/shared/rubyJVM/src/com/rho/RhoRuby.java

@@ -14,7 +14,9 @@ import com.rho.net.AsyncHttp;
 import com.rho.Properties;
 //import net.rim.device.api.system.CodeModuleManager;
 import java.util.Hashtable;
+import java.util.Vector;
 import com.rho.rjson.RJSONTokener;
+import com.rho.net.NetResponse;
 
 public class RhoRuby {
 
@@ -28,6 +30,7 @@ public class RhoRuby {
 	public static final RubyID raiseRhoError = RubyID.intern("raise_rhoerror");
 	public static final RubyID initApp = RubyID.intern("init_app");
 	public static final RubyID activateApp = RubyID.intern("activate_app");
+	public static final RubyID loadServerSources_mid = RubyID.intern("load_server_sources");
 	
 //	public static final RubyID getStartPath = RubyID.intern("get_start_path");
 //	public static final RubyID getOptionsPath = RubyID.intern("get_options_path");
@@ -60,8 +63,8 @@ public class RhoRuby {
 		{
 			String strMsg = exc.getMessage(); 
 			
-	    	return strMsg != null && (strMsg.indexOf("timed out") >= 0 || strMsg.indexOf("Timed out") >= 0)
-	    		? RhoRuby.ERR_NOSERVERRESPONSE : RhoRuby.ERR_NETWORK;
+            return strMsg != null && (strMsg.indexOf("timed out") >= 0 || strMsg.indexOf("Timed out") >= 0)
+	    		? RhoRuby.ERR_NOSERVERRESPONSE : RhoRuby.ERR_NETWORK;	    	
 		}
 		
 		return ERR_NONE;
@@ -72,6 +75,17 @@ public class RhoRuby {
 		return ERR_RUNTIME; 
 	}
 	
+	public static int  getErrorFromResponse(NetResponse resp)
+	{
+	    if ( resp.isUnathorized() )
+	    	return RhoRuby.ERR_UNATHORIZED;
+
+	    if ( !resp.isOK() )
+	    	return RhoRuby.ERR_REMOTESERVER;
+
+	    return RhoRuby.ERR_NONE;
+	}
+	
 	public static String getErrorText(int nError)
 	{
 		if ( nError == ERR_NONE )
@@ -126,10 +140,11 @@ public class RhoRuby {
 		//TODO: implement recursive dir creation
 		RhoClassFactory.createFile().getDirPath("apps");
 		RhoClassFactory.createFile().getDirPath("apps/public");
-		RhoClassFactory.createFile().getDirPath("apps/public/db-files");
+		RhoClassFactory.createFile().getDirPath("db");
+		RhoClassFactory.createFile().getDirPath("db/db-files");
 		
     	//Class mainRuby = Class.forName("xruby.ServeME.main");
-		DBAdapter.getInstance().startTransaction();
+		//DBAdapter.startAllDBTransaction();
 		try{
 			mainObj = helper.createMainObject();//new xruby.ServeME.main();//(RubyProgram)mainRuby.newInstance();
 			receiver = mainObj.invoke();
@@ -138,7 +153,7 @@ public class RhoRuby {
 				throw new RuntimeException("Initialize Rho framework failed.");
 		}finally
 		{
-			DBAdapter.getInstance().commit();
+			//DBAdapter.commitAllDBTransaction();
 		}
 		
 //		RubyModule modRhom = (RubyModule)RubyRuntime.ObjectClass.getConstant("Rhom");
@@ -152,10 +167,19 @@ public class RhoRuby {
 		RubyAPI.callPublicNoArgMethod(receiver, null, activateApp);
 	}
 
+	public static void loadserversources(String strData){
+		RubyAPI.callPublicOneArgMethod(receiver, ObjectFactory.createString(strData), null, loadServerSources_mid);
+	}
+	
 	public static boolean rho_ruby_isValid(){
 		return receiver!= null && receiver != RubyConstant.QNIL;
 	}
 	
+	public static boolean isMainRubyThread()
+	{
+		return RubyThread.isMainThread();
+	}
+	
 	public static void RhoRubyStop(){
 		
 		receiver = null;
@@ -257,6 +281,20 @@ public class RhoRuby {
 		((RubyArray)ar).add(val);
 	}
 	
+	public static Vector makeVectorStringFromArray(RubyValue v)
+	{
+		Vector res = new Vector();
+
+		if ( v == RubyConstant.QNIL )
+			return res;
+		
+		RubyArray ar = (RubyArray)v;
+		for ( int i = 0; i < ar.size(); i++ )
+			res.addElement(ar.get(i).toStr());
+		
+		return res;
+	}
+	
 	public static RubyValue addTimeToHash(RubyHash hash, String key, long val) {
 		return hash.add( ObjectFactory.createString(key), ObjectFactory.createTime(val) );
 	}