rhodes 2.0.0.beta7 → 2.0.0.beta8

data/lib/framework/rho/rhoapplication.rb

@@ -34,19 +34,38 @@ module Rho
 	      NativeBar.create(TOOLBAR_TYPE, @@toolbar)
       else
         NativeBar.create(NOBAR_TYPE, [])
-	    end
+	  end
+	  
+	  uniq_sources = Rho::RhoConfig::sources.values
+      uniq_sources.each do |source|
+          next unless source['migrate_version']
+          
+          db = ::Rho::RHO.get_src_db(source['name'])	  
+          
+          if !on_migrate_source(source['migrate_version'], source)
+            db.execute_batch_sql(source['schema']['sql'])
+          end  
+          
+          db.update_into_table('sources', {"schema_version"=>source['schema_version']},{"name"=>source['name']})
+      end
+          
     end
     
     def on_activate_app
     end
 
-    # works for schema sources    
+    # works for schema sources
+    #return true to run script creating table    
     def on_migrate_source(old_version, new_src)
         puts "on_migrate_source; old_version :#{old_version}; new_src : #{new_src}"
-        db = ::Rho::RHO.get_src_db(new_src['name'])
-        if new_src['schema']
+        if new_src['model_type'] == 'fixed_schema'
+            db = ::Rho::RHO.get_src_db(new_src['name'])
             db.delete_table(new_src['name'])
-        end    
+            
+            return false  #create new table
+        end
+        
+        return true
     end
     
     def set_menu(menu=nil,back_action=nil)

data/lib/framework/rhodes.rb

@@ -3,7 +3,7 @@ module Rhodes
     VERSION = '2.0.0'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '2.0.2'
+    DBVERSION = '2.0.3'
   end
   
 end

data/lib/framework/rhom/rhom_model.rb

@@ -16,30 +16,36 @@ module Rhom
     end
     
     def fixed_schema?
+        BaseModel.model_params ||= {}
+        BaseModel.model_params["model_type"] = "property_bag" unless BaseModel.model_params["model_type"]
+        
         false
     end
     
     def property(name,type=:string)
+      fixed_schema?()
+
   	  BaseModel.model_params ||= {}
-  	  
-  	  if type == :blob
-  	      BaseModel.model_params['blob_attribs'] ||= []
-  	      BaseModel.model_params['blob_attribs'] << name.to_s
-  	  end
-  	      
-  	  if fixed_schema?
-  	      BaseModel.model_params['schema'] ||= {}
-          BaseModel.model_params['schema']['columns'] ||= []  	  
-        
-  	      BaseModel.model_params['schema']['columns'] << name.to_s
-      	  #TODO: type support
-  	  end    
-  	  
+
+      BaseModel.model_params['schema'] ||= {}
+      BaseModel.model_params['schema']['property'] ||= {}
+      BaseModel.model_params['schema']['property'][name.to_s] = type 
+      
+
     end
 
     def set(name,value)
   	  BaseModel.model_params ||= {}
-  	  BaseModel.model_params[name.to_s] = value
+  	  
+  	  if ( name == :sync )
+  	    if ( value )
+  	        BaseModel.model_params['sync_type'] = 'incremental' unless BaseModel.model_params['sync_type']
+  	    else
+  	        BaseModel.model_params.delete('sync_type')
+  	    end        
+  	  else
+  	    BaseModel.model_params[name.to_s] = value
+  	  end
     end
 
     def enable(name)
@@ -48,27 +54,27 @@ module Rhom
     
     def belongs_to(name, owner)
   	  BaseModel.model_params ||= {}
-  	  BaseModel.model_params['associations'] ||= {}
+  	  BaseModel.model_params['belongs_to'] ||= {}
   	  
-  	  BaseModel.model_params['associations'][owner.to_s] = name.to_s
+  	  BaseModel.model_params['belongs_to'][name.to_s] = owner.to_s
     end
     
-    def index(*args)
+    def index(name,cols)
   	  return unless fixed_schema?
   	  
       BaseModel.model_params['schema'] ||= {}
-      BaseModel.model_params['schema']['indexes'] ||= []  	  
+      BaseModel.model_params['schema']['index'] ||= []  	  
 
-      BaseModel.model_params['schema']['indexes'] << args
+      BaseModel.model_params['schema']['index'] << {name.to_s=>cols}
     end
 
-    def unique_index(*args)
+    def unique_index(name,cols)
   	  return unless fixed_schema?
   	  
       BaseModel.model_params['schema'] ||= {}
-      BaseModel.model_params['schema']['unique_indexes'] ||= []  	  
+      BaseModel.model_params['schema']['unique_index'] ||= []  	  
 
-      BaseModel.model_params['schema']['unique_indexes'] << args
+      BaseModel.model_params['schema']['unique_index'] << {name.to_s=>cols}
     end
     
   end
@@ -81,6 +87,9 @@ module Rhom
     end
     
     def fixed_schema?
+        BaseModel.model_params ||= {}
+        BaseModel.model_params["model_type"] = "fixed_schema" unless BaseModel.model_params["model_type"]
+        
         true
     end
     

data/lib/framework/rhom/rhom_object_factory.rb

@@ -119,7 +119,7 @@ module Rhom
                 end
               
                 def is_schema_source
-                    Rho::RhoConfig.sources[get_source_name]['schema'] != nil
+                    Rho::RhoConfig.sources[get_source_name]['model_type'] == 'fixed_schema'
                 end
                 def get_schema_table_name
                     get_source_name()
@@ -1059,7 +1059,7 @@ module Rhom
               end
           
               def is_inst_schema_source
-                 Rho::RhoConfig.sources[get_inst_source_name]['schema'] != nil
+                 Rho::RhoConfig.sources[get_inst_source_name]['model_type'] == 'fixed_schema'
               end
               def get_inst_schema_table_name
                  get_inst_source_name()

data/lib/rhodes.rb

@@ -3,7 +3,7 @@ module Rhodes
     VERSION = '2.0.0'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '2.0.2'
+    DBVERSION = '2.0.3'
   end
   
 end

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

@@ -90,7 +90,9 @@ RHO_GLOBAL int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
     jmethodID mid = getJNIClassStaticMethod(env, cls, "getProperty", "(Ljava/lang/String;)Ljava/lang/Object;");
     if (!mid) return 0;
 
-    jobject result = env->CallStaticObjectMethod(cls, mid, rho_cast<jstring>(szPropName));
+    jstring propNameObj = rho_cast<jstring>(szPropName);
+    jobject result = env->CallStaticObjectMethod(cls, mid, propNameObj);
+    env->DeleteLocalRef(propNameObj);
     if (!result) return 0;
 
     jclass clsBoolean = getJNIClass(RHODES_JAVA_CLASS_BOOLEAN);
@@ -102,26 +104,31 @@ RHO_GLOBAL int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
     if (env->IsInstanceOf(result, clsBoolean)) {
         jmethodID midValue = getJNIClassMethod(env, clsBoolean, "booleanValue", "()Z");
         *resValue = rho_ruby_create_boolean((int)env->CallBooleanMethod(result, midValue));
+        env->DeleteLocalRef(result);
         return 1;
     }
     else if (env->IsInstanceOf(result, clsInteger)) {
         jmethodID midValue = getJNIClassMethod(env, clsInteger, "intValue", "()I");
         *resValue = rho_ruby_create_integer((int)env->CallIntMethod(result, midValue));
+        env->DeleteLocalRef(result);
         return 1;
     }
     else if (env->IsInstanceOf(result, clsFloat)) {
         jmethodID midValue = getJNIClassMethod(env, clsFloat, "floatValue", "()F");
         *resValue = rho_ruby_create_double((double)env->CallFloatMethod(result, midValue));
+        env->DeleteLocalRef(result);
         return 1;
     }
     else if (env->IsInstanceOf(result, clsDouble)) {
         jmethodID midValue = getJNIClassMethod(env, clsDouble, "doubleValue", "()D");
         *resValue = rho_ruby_create_double((double)env->CallDoubleMethod(result, midValue));
+        env->DeleteLocalRef(result);
         return 1;
     }
     else if (env->IsInstanceOf(result, clsString)) {
         jstring resStrObj = (jstring)result;
         *resValue = rho_ruby_create_string(rho_cast<std::string>(resStrObj).c_str());
+        env->DeleteLocalRef(result);
         return 1;
     }
 

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

@@ -20,7 +20,10 @@ RHO_GLOBAL void mapview_create(rho_param *p)
     }
 
     jobject paramsObj = RhoValueConverter(env).createObject(p);
-    env->CallStaticVoidMethod(clsMapView, midCreate, rho_cast<jstring>(RHO_GOOGLE_API_KEY), paramsObj);
+    jstring keyObj = rho_cast<jstring>(RHO_GOOGLE_API_KEY);
+    env->CallStaticVoidMethod(clsMapView, midCreate, keyObj, paramsObj);
+    env->DeleteLocalRef(keyObj);
+    env->DeleteLocalRef(paramsObj);
 #else
     RAWLOG_ERROR("MapView disabled at build time");
 #endif

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

@@ -46,7 +46,9 @@ RHO_GLOBAL jobject JNICALL Java_com_rhomobile_rhodes_socket_SSLImpl_getRemoteSoc
     arr[0] = (jbyte)(addr & 0xFF);
     env->ReleaseByteArrayElements(array, arr, 0);
 
-    jobject inetaddrObj = env->NewObject(clsInetAddr, midInetAddr, array, rho_cast<jstring>(::inet_ntoa(sa.sin_addr)));
+    jstring ipaddrObj = rho_cast<jstring>(::inet_ntoa(sa.sin_addr));
+    jobject inetaddrObj = env->NewObject(clsInetAddr, midInetAddr, array, ipaddrObj);
+    env->DeleteLocalRef(ipaddrObj);
     if (!inetaddrObj) return NULL;
 
     jobject sockaddrObj = env->NewObject(clsSockAddr, midSockAddr);
@@ -55,6 +57,8 @@ RHO_GLOBAL jobject JNICALL Java_com_rhomobile_rhodes_socket_SSLImpl_getRemoteSoc
     env->SetObjectField(sockaddrObj, fidInetAddr, inetaddrObj);
     env->SetIntField(sockaddrObj, fidPort, ntohs(sa.sin_port));
 
+    env->DeleteLocalRef(inetaddrObj);
+
     return sockaddrObj;
 }
 

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

@@ -69,7 +69,7 @@ RHO_GLOBAL const char* rho_webview_execute_js(const char* js, int index)
     if (!mid) return NULL;
 
     jstring objJs = rho_cast<jstring>(env, js);
-    env->CallStaticObjectMethod(cls, mid, objJs, index);
+    env->CallStaticVoidMethod(cls, mid, objJs, index);
     env->DeleteLocalRef(objJs);
     return "";
 }
@@ -90,4 +90,6 @@ RHO_GLOBAL void rho_webview_set_cookie(const char *url, const char *cookie)
     jstring urlObj = rho_cast<jstring>(url);
     jstring cookieObj = rho_cast<jstring>(cookie);
     env->CallStaticVoidMethod(cls, mid, urlObj, cookieObj);
+    env->DeleteLocalRef(urlObj);
+    env->DeleteLocalRef(cookieObj);
 }

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

@@ -47,14 +47,15 @@ public class NativeBar {
 		public void run() {
 			try {
 				Rhodes r = RhodesInstance.getInstance();
+				MainView mainView = r.getMainView();
 				MainView v = null;
 				
 				switch (type) {
 				case NOBAR_TYPE:
-					v = new SimpleMainView();
+					v = new SimpleMainView(mainView);
 					break;
 				case TOOLBAR_TYPE:
-					v = new SimpleMainView(params);
+					v = new SimpleMainView(mainView, params);
 					break;
 				case TABBAR_TYPE:
 					v = new TabbedMainView(params);

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

@@ -3,9 +3,9 @@ package com.rhomobile.rhodes;
 public class NativeLibraries {
 
 	public static void load() {
-		// Load native implementation of rhodes
-		System.loadLibrary("rhodes");
 		// Load native .so libraries
+	    // Load native implementation of rhodes
+	    System.loadLibrary("rhodes");
 	}
 	
 }

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

@@ -1,7 +1,6 @@
 package com.rhomobile.rhodes;
 
 import java.util.Map;
-import java.util.Vector;
 
 public class NavBar {
 
@@ -33,7 +32,7 @@ public class NavBar {
 		
 		public void run() {
 			Rhodes r = RhodesInstance.getInstance();
-			r.getMainView().setNavBar(title, left, right);
+			r.getMainView().addNavBar(title, left, right);
 		}
 	};
 	

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

@@ -199,7 +199,7 @@ public class Rhodes extends Activity {
 	*/
 	
 	private void copyFromBundle(String file) throws IOException {
-		File target = new File(sdcardRootPath(), file);
+		File target = new File(getRootPath(), file);
 		if (target.exists())
 			return;
 		FileSource as = new AssetsSource(getResources().getAssets());

data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java

@@ -49,8 +49,10 @@ public class GeoLocation {
 	
 	public static boolean isAvailable() {
 		try {
-			checkState();
 			Logger.T(TAG, "isAvailable");
+			if (locImpl == null)
+				return false;
+			checkState();
 			init();
 			return locImpl.isAvailable();
 		}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java

@@ -98,7 +98,6 @@ public class GeoLocationImpl implements LocationListener {
 	public void onProviderDisabled(String provider) {
 		Logger.T(TAG, "onProviderDisabled");
 		setCurrentGpsLocation(null);
-
 	}
 
 	public void onProviderEnabled(String provider) {

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java

@@ -23,11 +23,14 @@ package com.rhomobile.rhodes.mainview;
 import java.util.Map;
 
 import android.view.View;
+import android.webkit.WebView;
 
 public interface MainView {
 
 	public View getView();
 	
+	public WebView detachWebView();
+	
 	public void back(int index);
 	public void forward(int index);
 	
@@ -44,6 +47,6 @@ public interface MainView {
 	
 	public void loadData(String data, int index);
 	
-	public void setNavBar(String title, Map<Object,Object> left, Map<Object,Object> right);
+	public void addNavBar(String title, Map<Object,Object> left, Map<Object,Object> right);
 	public void removeNavBar();
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java

@@ -115,6 +115,16 @@ public class SimpleMainView implements MainView {
 		return view;
 	}
 	
+	public WebView detachWebView() {
+		WebView v = null;
+		if (webView != null) {
+			view.removeView(webView);
+			v = webView;
+			webView = null;
+		}
+		return v;
+	}
+	
 	private View createButton(Map<Object,Object> hash) {
 		Rhodes r = RhodesInstance.getInstance();
 		
@@ -200,7 +210,7 @@ public class SimpleMainView implements MainView {
 	}
 	
 	@SuppressWarnings("unchecked")
-	private void init(Vector<Object> params) {
+	private void init(MainView v, Vector<Object> params) {
 		Rhodes r = RhodesInstance.getInstance();
 		
 		view = new LinearLayout(r);
@@ -209,7 +219,11 @@ public class SimpleMainView implements MainView {
 		view.setLayoutParams(new LinearLayout.LayoutParams(FILL_PARENT, FILL_PARENT));
 		view.setId(Rhodes.RHO_MAIN_VIEW);
 		
-		webView = r.createWebView();
+		webView = null;
+		if (v != null)
+			webView = v.detachWebView();
+		if (webView == null)
+			webView = r.createWebView();
 		view.addView(webView, new LinearLayout.LayoutParams(FILL_PARENT, 0, 1));
 		
 		LinearLayout bottom = new LinearLayout(r);
@@ -254,11 +268,15 @@ public class SimpleMainView implements MainView {
 	}
 	
 	public SimpleMainView() {
-		init(null);
+		init(null, null);
+	}
+	
+	public SimpleMainView(MainView v) {
+		init(v, null);
 	}
 	
-	public SimpleMainView(Vector<Object> params) {
-		init(params);
+	public SimpleMainView(MainView v, Vector<Object> params) {
+		init(v, params);
 	}
 	
 	public void back(int index) {
@@ -297,7 +315,7 @@ public class SimpleMainView implements MainView {
 		webView.loadData(data, "text/html", "utf-8");
 	}
 
-	public void setNavBar(String title, Map<Object,Object> left, Map<Object,Object> right) {
+	public void addNavBar(String title, Map<Object,Object> left, Map<Object,Object> right) {
 		removeNavBar();
 		
 		Rhodes r = RhodesInstance.getInstance();

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java

@@ -33,6 +33,7 @@ import android.graphics.drawable.BitmapDrawable;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
+import android.webkit.WebView;
 import android.widget.FrameLayout;
 import android.widget.TabHost;
 import android.widget.TabWidget;
@@ -183,6 +184,10 @@ public class TabbedMainView implements MainView {
 		return host;
 	}
 	
+	public WebView detachWebView() {
+		return getView(activeTab()).detachWebView();
+	}
+	
 	public void back(int index) {
 		getView(index).back(0);
 	}
@@ -219,8 +224,8 @@ public class TabbedMainView implements MainView {
 		getView(index).loadData(data, 0);
 	}
 	
-	public void setNavBar(String title, Map<Object,Object> left, Map<Object,Object> right) {
-		getView(activeTab()).setNavBar(title, left, right);
+	public void addNavBar(String title, Map<Object,Object> left, Map<Object,Object> right) {
+		getView(activeTab()).addNavBar(title, left, right);
 	}
 	
 	public void removeNavBar() {