rhodes 2.2.6 → 2.3.0.beta.1

data/platform/shared/ruby/ext/rho/extensions.c

@@ -1,4 +1,3 @@
 // WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!
-// Generated Thu Mar 25 14:18:38 +0300 2010
 void Init_Extensions(void) {
 }

data/platform/shared/ruby/ext/rho/rhoruby.c

@@ -35,6 +35,7 @@ extern void Init_Alert(void);
 extern void Init_Camera(void);
 extern void Init_SignatureTool(void);
 extern void Init_RhoBluetooth(void);
+extern void Init_RhodesNativeViewManager(void);
 extern void Init_stringio(void);
 extern void Init_DateTimePicker(void);
 extern void Init_NativeBar(void);
@@ -58,9 +59,14 @@ static VALUE  framework;
 static ID framework_mid;
 static ID framework_mid2;
 static ID initApp_mid;
+static ID onConfigConflicts_mid;
 static ID activateApp_mid;
 static ID deactivateApp_mid;
+static ID uiCreated_mid;
+static ID uiDestroyed_mid;
 static ID loadServerSources_mid;
+static ID loadAllSyncSources_mid;
+static ID resetDBOnSyncUserChanged_mid;
 
 static char* rb_type_to_s(VALUE obj);
 //extern int ruby_thread_set_native(rb_thread_t *th);
@@ -162,6 +168,7 @@ void RhoRubyStart()
     Init_Alert();
     Init_SignatureTool();
     Init_RhoBluetooth();	
+	Init_RhodesNativeViewManager();	
     Init_Camera();
     Init_stringio();
     Init_DateTimePicker();
@@ -203,9 +210,14 @@ void RhoRubyStart()
     CONST_ID(framework_mid, "serve");
     CONST_ID(framework_mid2, "serve_index");
     CONST_ID(initApp_mid, "init_app");
+    CONST_ID(onConfigConflicts_mid, "on_config_conflicts");
     CONST_ID(activateApp_mid, "activate_app");
     CONST_ID(deactivateApp_mid, "deactivate_app");
+    CONST_ID(uiCreated_mid, "ui_created");
+    CONST_ID(uiDestroyed_mid, "ui_destroyed");
     CONST_ID(loadServerSources_mid,"load_server_sources");
+    CONST_ID(loadAllSyncSources_mid,"load_all_sync_sources");
+    CONST_ID(resetDBOnSyncUserChanged_mid, "reset_db_on_sync_user_changed");
 
     //moduleRhom = rb_const_get(rb_cObject, rb_intern("Rhom"));
 
@@ -220,6 +232,16 @@ void RhoRubyInitApp()
     rb_funcall(framework, initApp_mid, 0);
 }
 
+VALUE rho_conf_get_conflicts();
+void rho_ruby_call_config_conflicts()
+{
+    VALUE hashConflicts = rho_conf_get_conflicts();
+    if ( RHASH_EMPTY_P(hashConflicts) )
+        return;
+
+    rb_funcall(framework, onConfigConflicts_mid, 1, hashConflicts);
+}
+
 void rho_ruby_activateApp()
 {
     rb_funcall(framework, activateApp_mid, 0);
@@ -230,11 +252,31 @@ void rho_ruby_deactivateApp()
     rb_funcall(framework, deactivateApp_mid, 0);
 }
 
+void rho_ruby_uiCreated()
+{
+    rb_funcall(framework, uiCreated_mid, 0);
+}
+
+void rho_ruby_uiDestroyed()
+{
+    rb_funcall(framework, uiDestroyed_mid, 0);
+}
+
 void rho_ruby_loadserversources(const char* szData)
 {
     rb_funcall(framework, loadServerSources_mid, 1, rb_str_new2(szData) );
 }
 
+void rho_ruby_loadallsyncsources()
+{
+    rb_funcall(framework, loadAllSyncSources_mid, 0 );
+}
+
+void rho_ruby_reset_db_on_sync_user_changed()
+{
+    rb_funcall(framework, resetDBOnSyncUserChanged_mid, 0);
+}
+
 const char* rho_ruby_getRhoDBVersion()
 {
     VALUE moduleRhodes = rb_const_get(rb_cObject, rb_intern("Rhodes"));
@@ -592,6 +634,17 @@ void rho_ruby_raise_runtime(const char* szText)
     rb_raise(rb_eRuntimeError, szText );
 }
 
+void rho_ruby_raise_argerror(const char *fmt, ...)
+{
+	va_list args;
+	VALUE mesg;
+
+	va_start(args, fmt);
+	mesg = rb_vsprintf(fmt, args);
+	va_end(args);
+	rb_exc_raise(rb_exc_new3(rb_eArgError, mesg));
+}
+
 VALUE rho_ruby_main_thread()
 {
     return rb_thread_main();

data/platform/shared/ruby/ext/rho/rhoruby.h

@@ -34,9 +34,14 @@ void RhoRubyStart();
 void RhoRubyInitApp();
 //void RhoRubyThreadStart();
 //void RhoRubyThreadStop();
+void rho_ruby_call_config_conflicts();
 void rho_ruby_activateApp();
 void rho_ruby_deactivateApp();
+void rho_ruby_uiCreated();
+void rho_ruby_uiDestroyed();
 void rho_ruby_loadserversources(const char* szData);
+void rho_ruby_loadallsyncsources();
+void rho_ruby_reset_db_on_sync_user_changed();
 void rho_ruby_start_threadidle();
 void rho_ruby_stop_threadidle();
 
@@ -112,6 +117,7 @@ void rho_ruby_lock_mutex(VALUE val);
 void rho_ruby_unlock_mutex(VALUE val);
 
 void rho_ruby_raise_runtime(const char* szText);
+void rho_ruby_raise_argerror(const char *fmt, ...);
 
 #define RHO_PARAM_UNKNWON 0
 #define RHO_PARAM_STRING 1

data/platform/shared/ruby/ext/sqlite3_api/sqlite3_api_wrap.c

@@ -263,7 +263,7 @@ static VALUE db_execute(int argc, VALUE *argv, VALUE self)
                 switch( TYPE(arg) )
                 {
                 case T_STRING:
-                    sqlite3_bind_text(statement, i+1, RSTRING_PTR(arg), -1, SQLITE_TRANSIENT);
+                    sqlite3_bind_text(statement, i+1, RSTRING_PTR(arg), RSTRING_LEN(arg), SQLITE_TRANSIENT);
                     break;
                 case T_FIXNUM:
                 case T_FLOAT:
@@ -304,8 +304,11 @@ static VALUE db_execute(int argc, VALUE *argv, VALUE self)
                         break;
                     }
 				    default:{
-					    char *text = (char *)sqlite3_column_text(statement, nCol);
-					    colValue = rb_str_new2(text);
+                        sqlite3_value * sqlValue = sqlite3_column_value(statement, nCol);
+                        int nLen = sqlite3_value_bytes(sqlValue);
+                        const char*  szValue = (const char *)sqlite3_value_text(sqlValue);
+					    //char *text = (char *)sqlite3_column_text(statement, nCol);
+					    colValue = rb_str_new(szValue, nLen);
 					    break;
 				    }
 			    }

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

@@ -31,6 +31,9 @@
 	#define get_src_attrs rho_sync_get_attrs
 	extern VALUE rho_sync_is_blob_attr(const char* szPartition, int source_id, const char* szAttrName);
 	#define is_blob_attr rho_sync_is_blob_attr
+
+	extern void rho_sync_update_blob_attribs(const char* szPartition, int source_id);
+	#define update_blob_attribs rho_sync_update_blob_attribs
 	
     extern void  rho_sync_setobjectnotify_url(const char* szUrl);
     #define set_objectnotify_url rho_sync_setobjectnotify_url
@@ -60,6 +63,9 @@
 
     extern void rho_sync_set_source_property(int nSrcID, const char* szPropName, const char* szPropValue);
 	#define set_source_property rho_sync_set_source_property
+
+	extern void rho_sync_set_ssl_verify_peer(int b);
+	#define set_ssl_verify_peer rho_sync_set_ssl_verify_peer
 	
 	#if !defined(bool)
 	#define bool int
@@ -93,4 +99,6 @@ extern int   get_pagesize();
 extern void  set_pagesize(int pagesize);
 extern void  set_threaded_mode(bool b);
 extern void  enable_status_popup(bool b);
-extern void  set_source_property(int nSrcID, const char* szPropName, const char* szPropValue);
+extern void  set_source_property(int nSrcID, const char* szPropName, const char* szPropValue);
+extern void  set_ssl_verify_peer(bool b);
+extern void  update_blob_attribs(const char* szPartition, int source_id);

data/platform/shared/ruby/ext/syncengine/syncengine_wrap.c

@@ -1844,6 +1844,9 @@ static VALUE mSyncEngine;
 	#define get_src_attrs rho_sync_get_attrs
 	extern VALUE rho_sync_is_blob_attr(const char* szPartition, int source_id, const char* szAttrName);
 	#define is_blob_attr rho_sync_is_blob_attr
+
+	extern void rho_sync_update_blob_attribs(const char* szPartition, int source_id);
+	#define update_blob_attribs rho_sync_update_blob_attribs
 	
     extern void  rho_sync_setobjectnotify_url(const char* szUrl);
     #define set_objectnotify_url rho_sync_setobjectnotify_url
@@ -1873,6 +1876,9 @@ static VALUE mSyncEngine;
 
     extern void rho_sync_set_source_property(int nSrcID, const char* szPropName, const char* szPropValue);
 	#define set_source_property rho_sync_set_source_property
+
+	extern void rho_sync_set_ssl_verify_peer(int b);
+	#define set_ssl_verify_peer rho_sync_set_ssl_verify_peer
 	
 	#if !defined(bool)
 	#define bool int
@@ -2676,6 +2682,59 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_set_ssl_verify_peer(int argc, VALUE *argv, VALUE self) {
+  bool arg1 ;
+  bool 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_bool(argv[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "bool","set_ssl_verify_peer", 1, argv[0] ));
+  } 
+  arg1 = (bool)(val1);
+  set_ssl_verify_peer(arg1);
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_update_blob_attribs(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  int arg2 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","update_blob_attribs", 1, argv[0] ));
+  }
+  arg1 = (char *)(buf1);
+  ecode2 = SWIG_AsVal_int(argv[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","update_blob_attribs", 2, argv[1] ));
+  } 
+  arg2 = (int)(val2);
+  update_blob_attribs((char const *)arg1,arg2);
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  return Qnil;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  return Qnil;
+}
+
+
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
@@ -2972,5 +3031,7 @@ SWIGEXPORT void Init_SyncEngine(void) {
   rb_define_module_function(mSyncEngine, "set_threaded_mode", _wrap_set_threaded_mode, -1);
   rb_define_module_function(mSyncEngine, "enable_status_popup", _wrap_enable_status_popup, -1);
   rb_define_module_function(mSyncEngine, "set_source_property", _wrap_set_source_property, -1);
+  rb_define_module_function(mSyncEngine, "set_ssl_verify_peer", _wrap_set_ssl_verify_peer, -1);
+  rb_define_module_function(mSyncEngine, "update_blob_attribs", _wrap_update_blob_attribs, -1);
 }
 

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

@@ -45,6 +45,9 @@ extern void rho_sys_open_url(const char* url);
 #define app_installed rho_sys_is_app_installed
 extern int rho_sys_is_app_installed(const char *appname);
 
+#define app_install rho_sys_app_install
+extern void rho_sys_app_install(const char *url);
+
 #define app_uninstall rho_sys_app_uninstall
 extern void rho_sys_app_uninstall(const char *appname);
 
@@ -96,4 +99,5 @@ extern const char* get_start_params();
 extern void open_url(const char *url);
 %predicate app_installed(const char *appname);
 extern int app_installed(const char *appname);
+extern void app_install(const char *url);
 extern void app_uninstall(const char *appname);

data/platform/shared/ruby/ext/system/system_wrap.c

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.0
+ * Version 2.0.1
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -281,7 +281,7 @@
 /* 
    Flags/methods for returning states.
    
-   The SWIG conversion methods, as ConvertPtr, return and integer 
+   The SWIG conversion methods, as ConvertPtr, return an integer 
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
    
@@ -998,7 +998,7 @@ static VALUE _mSWIG = Qnil;
 
 /* Define custom exceptions for errors that do not map to existing Ruby
    exceptions.  Note this only works for C++ since a global cannot be
-   initialized by a funtion in C.  For C, fallback to rb_eRuntimeError.*/
+   initialized by a function in C.  For C, fallback to rb_eRuntimeError.*/
 
 SWIGINTERN VALUE 
 getNullReferenceError(void) {
@@ -1807,7 +1807,7 @@ static VALUE mSystem;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020000 
+#define SWIGVERSION 0x020001 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1859,6 +1859,9 @@ extern void rho_sys_open_url(const char* url);
 #define app_installed rho_sys_is_app_installed
 extern int rho_sys_is_app_installed(const char *appname);
 
+#define app_install rho_sys_app_install
+extern void rho_sys_app_install(const char *url);
+
 #define app_uninstall rho_sys_app_uninstall
 extern void rho_sys_app_uninstall(const char *appname);
 
@@ -1941,7 +1944,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:C:\Rhode\swigwin-2.0.0\Lib\ruby\rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/share/swig/2.0.1/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2414,6 +2417,30 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_app_install(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","app_install", 1, argv[0] ));
+  }
+  arg1 = (char *)(buf1);
+  app_install((char const *)arg1);
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  return Qnil;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_app_uninstall(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
@@ -2730,6 +2757,7 @@ SWIGEXPORT void Init_System(void) {
   rb_define_module_function(mSystem, "get_start_params", _wrap_get_start_params, -1);
   rb_define_module_function(mSystem, "open_url", _wrap_open_url, -1);
   rb_define_module_function(mSystem, "app_installed?", _wrap_app_installedq___, -1);
+  rb_define_module_function(mSystem, "app_install", _wrap_app_install, -1);
   rb_define_module_function(mSystem, "app_uninstall", _wrap_app_uninstall, -1);
 }
 

data/platform/shared/rubyext/RhoAppAdapter.cpp

@@ -40,9 +40,19 @@ const _CRhoAppAdapter& RhoAppAdapter = _CRhoAppAdapter();
     rho_ruby_loadserversources(strSources.c_str());
 }
 
+/*static*/ void  _CRhoAppAdapter::loadAllSyncSources()
+{
+    rho_ruby_loadallsyncsources();
+}
+
 /*static*/ const char* _CRhoAppAdapter::getRhoDBVersion()
 {
 	return rho_ruby_getRhoDBVersion();
 }
-	
+
+/*static*/ void  _CRhoAppAdapter::resetDBOnSyncUserChanged()
+{
+    rho_ruby_reset_db_on_sync_user_changed();
+}
+
 }

data/platform/shared/rubyext/System.cpp

@@ -56,6 +56,9 @@ VALUE rho_sys_get_property(char* szPropName)
 	if (strcasecmp("is_emulator",szPropName) == 0) 
         return rho_ruby_create_boolean(0);
 
+	if (strcasecmp("has_touchscreen",szPropName) == 0)
+        return rho_ruby_create_boolean(1);
+
     RAWLOG_ERROR1("Unknown Rho::System property : %s", szPropName);
 
     return rho_ruby_get_NIL();
@@ -85,4 +88,10 @@ int rho_sys_set_sleeping(int sleeping)
 }
 #endif //defined(OS_MACOSX) || defined(OS_ANDROID)
 
+const char* rho_sys_get_start_params() 
+{
+    return rho::common::CRhodesApp::getStartParameters().c_str();
+}
+
+
 } //extern "C"

data/platform/shared/rubyext/WebView.h

@@ -10,6 +10,7 @@ extern "C" {
 void rho_webview_refresh(int index);
 void rho_webview_navigate(const char* url, int index);
 void rho_webview_navigate_back();
+void rho_webview_navigate_forward();
 const char* rho_webview_execute_js(const char* js, int index);
 const char* rho_webview_current_location(int index);
 int rho_webview_active_tab();