rhodes 3.3.3.beta.1 → 3.3.3.beta.2

data/lib/framework/rho/rho.rb

@@ -572,6 +572,15 @@ end
                 SyncEngine.set_source_property(src['source_id'], prop, src[prop] ? src[prop].to_s() : '' )
             end            
         end
+        
+        uniq_sources.each do|src|
+            if src.has_key?('freezed') || !src['schema'].nil?
+                hash_props = !src['schema'].nil? ? src['schema']["property"] : src["property"]
+                str_props = hash_props.keys.join(',')
+                SyncEngine.set_source_property(src['source_id'], 'freezed', str_props )
+            end            
+        end
+        
     end
     
     def self.processIndexes(index_param, src_name, is_unique)
@@ -1303,4 +1312,25 @@ module Kernel
         Rho::RHO.get_instance().load_model(name.to_s)        
     end
     
-end    
+end    
+
+if defined?(RHO_WP7).nil?
+module WebView
+
+    class << self
+        alias_method :orig_execute_js, :execute_js
+    end
+
+    def self.execute_js(func, index = 0, vals = nil)
+        if (vals && 0 < vals.size)
+            func += '('
+            vals.each do |val|
+                func += val
+                func += ',' if val != vals.last
+            end
+            func += ');'
+        end
+       orig_execute_js(func, index)                
+    end
+end
+end

data/lib/framework/rho/rhocontroller.rb

@@ -52,8 +52,8 @@ module Rho
 
     def default_action
       return Hash['GET','show','PUT','update','POST','update',
-        'DELETE','delete'][@request['request-method']] unless @request['id'].nil?
-      return Hash['GET','index','POST','create'][@request['request-method']]
+        'DELETE','delete'][@request['request-method'].upcase] unless @request['id'].nil?
+      return Hash['GET','index','POST','create'][@request['request-method'].upcase]
     end
 
     def self.process_rho_object(params)

data/lib/framework/rhodes.rb

@@ -1,6 +1,6 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '3.3.2'
+    VERSION = '3.3.3'
   end
   unless defined? Rhodes::DBVERSION
     DBVERSION = '2.2.0'

data/lib/framework/rhoframework.rb

@@ -82,6 +82,10 @@ module Kernel
 		""
 	end
 
+	def __rhoGetRuntimeDir
+		""
+	end
+
 	alias :orig_require :require
 
 	def require(file_name)

data/lib/framework/rholang/localization_simplified.rb

@@ -47,7 +47,7 @@ module LocalizationSimplified
 if defined?( RHODES_EMULATOR )        
             file = File.join( __rhoGetRhodesDir(), 'lib/framework', file)
 else
-            file = File.join( __rhoGetCurrentDir(), 'lib', file)            
+            file = File.join( __rhoGetRuntimeDir(), 'lib', file)
 end            
         end
 

data/lib/framework/rhom/rhom_object_factory.rb

@@ -62,6 +62,8 @@ module Rhom
               end
               
               def initialize(obj=nil)
+                check_freezing_model(obj)
+              
                 @vars = {}
                 self.rhom_init(@vars)
                 self.vars[:object] = "#{generate_id()}" unless obj && obj[:object]
@@ -93,13 +95,30 @@ module Rhom
               def method_missing(name, *args)
                 unless name == Fixnum
                   if name[name.length()-1] == '='
-                    @vars[name.to_s.chop.to_sym()] = args[0]  
+                    s_name = name.to_s.chop
+                    check_freezing_model(s_name)
+                    @vars[s_name.to_sym()] = args[0]  
                   else
                     @vars[name]
                   end
                 end
               end
 
+                def check_freezing_model(obj)
+                    isSchemaSrc = is_inst_schema_source()
+                    return unless obj && (isSchemaSrc || Rho::RhoConfig.sources[get_inst_source_name()]['freezed'])
+                     
+                    hash_props = isSchemaSrc ? Rho::RhoConfig.sources[get_inst_source_name()]['schema']["property"] : Rho::RhoConfig.sources[get_inst_source_name()]["property"]
+                    if obj.is_a?(Hash)
+                        obj.each do |key, value|
+                            next if key.to_s() == 'object'
+                            raise ArgumentError.new( "Non-exist property : #{key}. For model : #{get_inst_source_name()}" ) unless hash_props[key.to_s()]
+                        end
+                    elsif obj.to_s() != 'object'
+                        raise ArgumentError.new( "Non-exist property : #{obj}. For model : #{get_inst_source_name()}" ) unless hash_props[obj.to_s()]
+                    end    
+                end
+
               class << self
 
                 def metadata
@@ -1679,6 +1698,8 @@ module Rhom
               # updates the current record in the viewable list and adds
               # a sync operation to update
               def update_attributes(attrs)
+                check_freezing_model(attrs)
+              
                 obj = self.object #self.inst_strip_braces(self.object)
                 update_type='update'
                 nSrcID = self.get_inst_source_id

data/lib/framework/version.rb

@@ -1,6 +1,6 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '3.3.2'
+    VERSION = '3.3.3'
   end
   unless defined? RhodesFramework::DBVERSION
     DBVERSION = '2.2.2'

data/lib/rhodes.rb

@@ -1,6 +1,6 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '3.3.2'
+    VERSION = '3.3.3'
   end
   unless defined? Rhodes::DBVERSION
     DBVERSION = '2.2.0'

data/platform/android/Rhodes/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.rhomobile.rhodes"
     android:installLocation="auto"
-    android:versionCode="37"
-    android:versionName="3.3.2">
+    android:versionCode="38"
+    android:versionName="3.3.3">
     
     <uses-sdk android:minSdkVersion="8" />
     

data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesService.h

@@ -11,14 +11,6 @@ extern "C" {
 #define com_rhomobile_rhodes_RhodesService_DEBUG 0L
 #undef com_rhomobile_rhodes_RhodesService_DOWNLOAD_PACKAGE_ID
 #define com_rhomobile_rhodes_RhodesService_DOWNLOAD_PACKAGE_ID 1L
-/*
- * Class:     com_rhomobile_rhodes_RhodesService
- * Method:    initClassLoader
- * Signature: (Ljava/lang/ClassLoader;)V
- */
-JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_initClassLoader
-  (JNIEnv *, jobject, jobject);
-
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
  * Method:    doSyncAllSources
@@ -49,7 +41,23 @@ JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_normalizeUrl
  * Signature: (Ljava/lang/String;)V
  */
 JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_doRequest
-  (JNIEnv *, jobject, jstring);
+  (JNIEnv *, jclass, jstring);
+
+/*
+ * Class:     com_rhomobile_rhodes_RhodesService
+ * Method:    doRequestAsync
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_doRequestAsync
+  (JNIEnv *, jclass, jstring);
+
+/*
+ * Class:     com_rhomobile_rhodes_RhodesService
+ * Method:    doRequestEx
+ * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_RhodesService_doRequestEx
+  (JNIEnv *, jclass, jstring, jstring, jstring, jboolean);
 
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
@@ -115,6 +123,14 @@ JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getBuildConfig
 JNIEXPORT jboolean JNICALL Java_com_rhomobile_rhodes_RhodesService_isOnStartPage
   (JNIEnv *, jclass);
 
+/*
+ * Class:     com_rhomobile_rhodes_RhodesService
+ * Method:    getInvalidSecurityTokenMessage
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_getInvalidSecurityTokenMessage
+  (JNIEnv *, jclass);
+
 /*
  * Class:     com_rhomobile_rhodes_RhodesService
  * Method:    isTitleEnabled

data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_extmanager_RhoExtManagerImpl.h

@@ -0,0 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_rhomobile_rhodes_extmanager_RhoExtManagerImpl */
+
+#ifndef _Included_com_rhomobile_rhodes_extmanager_RhoExtManagerImpl
+#define _Included_com_rhomobile_rhodes_extmanager_RhoExtManagerImpl
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     com_rhomobile_rhodes_extmanager_RhoExtManagerImpl
+ * Method:    nativeRequireRubyFile
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_extmanager_RhoExtManagerImpl_nativeRequireRubyFile
+  (JNIEnv *, jclass, jstring);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

data/platform/android/Rhodes/jni/src/extmanager.cpp

@@ -0,0 +1,36 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+*
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+*
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+#include "rhodes/JNIRhodes.h"
+#include "rhodes/JNIRhoRuby.h"
+
+#include <ruby/ext/rho/rhoruby.h>
+
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_extmanager_RhoExtManagerImpl_nativeRequireRubyFile
+  (JNIEnv * env, jclass, jstring jPath)
+{
+
+}

data/platform/android/Rhodes/jni/src/nativeview.cpp

@@ -136,7 +136,7 @@ void* RhoNativeViewManager::getWebViewObject(int tab_index) {
     JNIEnv *env = jnienv();
     jclass cls = rho_find_class(env, "com/rhomobile/rhodes/nativeview/RhoNativeViewManager");
     if (!cls) return null;
-    jmethodID mid = env->GetStaticMethodID( cls, "getWebViewObject", "(I)Lcom/rhomobile/rhodes/webview/WebView;");
+    jmethodID mid = env->GetStaticMethodID( cls, "getWebViewObject", "(I)Landroid/webkit/WebView;");
     if (!mid) return null;
     return env->CallStaticObjectMethod(cls, mid, tab_index);
 }

data/platform/android/Rhodes/jni/src/rhodesapp.cpp

@@ -178,17 +178,26 @@ RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesAppOptions_getBlobPat
 }
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_doRequest
-  (JNIEnv *env, jobject, jstring strUrl)
+  (JNIEnv *env, jclass, jstring strUrl)
 {
-    std::string const &url = rho_cast<std::string>(strUrl);
+    std::string url = rho_cast<std::string>(strUrl);
     rho_net_request(url.c_str());
 }
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_doRequestAsync
-  (JNIEnv *env, jobject, jstring strUrl)
+  (JNIEnv *env, jclass, jstring strUrl)
+{
+    std::string url = rho_cast<std::string>(strUrl);
+    RHODESAPP().runCallbackInThread(url, "");
+}
+
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_doRequestEx
+  (JNIEnv *env, jclass, jstring jUrl, jstring jBody, jstring jData, jboolean waitForResponse)
 {
-    std::string const &url = rho_cast<std::string>(strUrl);
-    RHODESAPP().runCallbackInThread(url.c_str(), "");
+    std::string url = rho_cast<std::string>(jUrl);
+    std::string body = rho_cast<std::string>(jBody);
+    std::string data = rho_cast<std::string>(jData);
+    RHODESAPP().callCallbackWithData(url, body, data, waitForResponse);
 }
 
 RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_normalizeUrl

data/platform/android/Rhodes/jni/src/rhodessystem.cpp

@@ -59,6 +59,11 @@ const char* rho_native_rhopath()
     return rho_root_path().c_str();
 }
 //--------------------------------------------------------------------------------------------------
+const char* rho_native_reruntimepath()
+{
+    return rho_root_path().c_str();
+}
+//--------------------------------------------------------------------------------------------------
 rho::String rho_cur_path()
 {
     char buf[PATH_MAX];

data/platform/android/Rhodes/jni/src/signature.cpp

@@ -79,15 +79,41 @@ RHO_GLOBAL void rho_signature_take(char* callback_url, rho_param* p)
 
 RHO_GLOBAL void rho_signature_visible(bool b, rho_param* p)
 {
-    //TODO: rho_signature_visible
+    JNIEnv *env = jnienv();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_SIGNATURE);
+    if (!cls) return;
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "inline_signature_visible", "(ILjava/lang/Object;)V");
+    if (!mid) return;
+
+    int visible = 0;
+    if (b) visible = 1;
+    
+    jobject paramsObj = RhoValueConverter(env).createObject(p);
+    env->CallStaticVoidMethod(cls, mid, visible, paramsObj);
+    env->DeleteLocalRef(paramsObj);
 }
 
 RHO_GLOBAL void rho_signature_capture(const char* callback_url) 
 {
-    //TODO: rho_signature_capture
+    JNIEnv *env = jnienv();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_SIGNATURE);
+    if (!cls) return;
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "inline_signature_capture", "(Ljava/lang/String;)V");
+    if (!mid) return;
+    jhstring objCallback = rho_cast<jhstring>(callback_url);
+    
+    env->CallStaticVoidMethod(cls, mid, objCallback.get());
+    
+    
 }
 
 RHO_GLOBAL void rho_signature_clear() 
 {
-    //TODO: rho_signature_clear
+    JNIEnv *env = jnienv();
+    jclass cls = getJNIClass(RHODES_JAVA_CLASS_SIGNATURE);
+    if (!cls) return;
+    jmethodID mid = getJNIClassStaticMethod(env, cls, "inline_signature_clear", "()V");
+    if (!mid) return;
+    env->CallStaticVoidMethod(cls, mid);
+    
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java

@@ -30,7 +30,7 @@ import com.rhomobile.rhodes.mainview.MainView;
 import com.rhomobile.rhodes.mainview.SimpleMainView;
 import com.rhomobile.rhodes.mainview.TabbedMainView;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
-import com.rhomobile.rhodes.webview.WebView;
+import com.rhomobile.rhodes.webview.IRhoWebView;
 
 public class NativeBar {
 	
@@ -65,7 +65,7 @@ public class NativeBar {
 				switch (type) {
 				case NOBAR_TYPE:
                     if (smv == null) {
-                        WebView webView = mainView.detachWebView();
+                        IRhoWebView webView = mainView.detachWebView();
                         v = new SimpleMainView(webView);
                     } else
 						smv.removeToolbar();
@@ -73,7 +73,7 @@ public class NativeBar {
 					break;
 				case TOOLBAR_TYPE:
                     if (smv == null) {
-                        WebView webView = mainView.detachWebView();
+                        IRhoWebView webView = mainView.detachWebView();
                         v = new SimpleMainView(webView, params);
                     }
 					else

data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java

@@ -36,6 +36,7 @@ import com.rhomobile.rhodes.camera.Camera;
 import com.rhomobile.rhodes.mainview.MainView;
 import com.rhomobile.rhodes.mainview.SimpleMainView;
 import com.rhomobile.rhodes.mainview.SplashScreen;
+import com.rhomobile.rhodes.signature.Signature;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
 import com.rhomobile.rhodes.util.Utils;
 
@@ -161,6 +162,9 @@ public class RhodesActivity extends BaseActivity {
         mSplashScreen = new SplashScreen(this);
         setMainView(mSplashScreen);
 
+        
+        Signature.registerSignatureCaptureExtension();
+        
 		processStartupListeners();
         {
         	Iterator<RhodesActivityListener> iterator = mListeners.iterator();

data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java

@@ -227,8 +227,9 @@ public class RhodesService extends Service {
 	
 	public native String normalizeUrl(String url);
 	
-	public native void doRequest(String url);
-	public native void doRequestAsync(String url);
+	public static native void doRequest(String url);
+	public static native void doRequestAsync(String url);
+	public static native void doRequestEx(String url, String body, String data, boolean waitForResponse);
 	
 	public static native void loadUrl(String url);
 	
@@ -623,7 +624,7 @@ public class RhodesService extends Service {
 		return hostExists;
 	}
 	
-	private static boolean hasNetwork() {
+	private static boolean hasNetworkEx( boolean checkCell, boolean checkWifi, boolean checkEthernet, boolean checkWimax, boolean checkBluetooth, boolean checkAny) {
 		if (!Capabilities.NETWORK_STATE_ENABLED) {
 			Logger.E(TAG, "HAS_NETWORK: Capability NETWORK_STATE disabled");
 			return false;
@@ -643,12 +644,30 @@ public class RhodesService extends Service {
 			Logger.E(TAG, "HAS_NETWORK: cannot issue getAllNetworkInfo");
 			return false;
 		}
+
+		//{
+		//	Utils.platformLog("NETWORK", "$$$$$$$$$$$$$$$$$$$   Networks ; $$$$$$$$$$$$$$$$$$$$$$");
+		//	for (int i = 0, lim = info.length; i < lim; ++i) 
+		//	{
+		//		int type = info[i].getType();
+		//		String name = info[i].getTypeName();
+		//		boolean is_connected = info[i].getState() == NetworkInfo.State.CONNECTED;
+		//		Utils.platformLog("NETWORK", "        - Name ["+name+"],  type ["+String.valueOf(type)+"], connected ["+String.valueOf(is_connected)+"]");
+		//	}
+		//}
 		
 		for (int i = 0, lim = info.length; i < lim; ++i) 
 		{
-		    //Logger.I(TAG, "HAS_NETWORK: " + info[i].toString() );
-			if (info[i].getState() == NetworkInfo.State.CONNECTED)
-				return true;
+			boolean is_connected = info[i].getState() == NetworkInfo.State.CONNECTED;
+			int type = info[i].getType();
+			if (is_connected) {
+				if ((type == ConnectivityManager.TYPE_MOBILE) && (checkCell)) return true;
+				if ((type == ConnectivityManager.TYPE_WIFI) && (checkWifi)) return true;
+				if ((type == 6) && (checkWimax)) return true;
+				if ((type == 9) && (checkEthernet)) return true;
+				if ((type == 7) && (checkBluetooth)) return true;
+				if (checkAny) return true; 
+			}
 		}
 
     	Logger.I(TAG, "HAS_NETWORK: all networks are disconnected");
@@ -656,6 +675,18 @@ public class RhodesService extends Service {
 		return false;
 	}
 	
+	private static boolean hasWiFiNetwork() {
+		return hasNetworkEx(false, true, true, true, false, false);
+	}
+	
+	private static boolean hasCellNetwork() {
+		return hasNetworkEx(true, false, false, false, false, false);
+	}
+	
+	private static boolean hasNetwork() {
+		return hasNetworkEx(true, true, true, true, false, true);
+	}
+	
 	private static String getCurrentLocale() {
 		String locale = Locale.getDefault().getLanguage();
 		if (locale.length() == 0)
@@ -724,7 +755,11 @@ public class RhodesService extends Service {
 			else if (name.equalsIgnoreCase("has_camera"))
 				return new Boolean(mCameraAvailable);
 			else if (name.equalsIgnoreCase("has_network"))
-				return hasNetwork();
+				return new Boolean(hasNetwork());
+			else if (name.equalsIgnoreCase("has_wifi_network"))
+				return new Boolean(hasWiFiNetwork());
+			else if (name.equalsIgnoreCase("has_cell_network"))
+				return new Boolean(hasCellNetwork());
 			else if (name.equalsIgnoreCase("ppi_x"))
 				return new Float(getScreenPpiX());
 			else if (name.equalsIgnoreCase("ppi_y"))