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

data/platform/wp7/RhoRubyLib/rubyext/RhoWebView.cs

@@ -87,11 +87,21 @@ namespace rho.rubyext
         }
 
         [RubyMethodAttribute("execute_js", RubyMethodAttributes.PublicSingleton)]
-        public static void execute_js(RubyModule/*!*/ self, [NotNull]String/*!*/ strScript, int index = 0)
+        public static void execute_js(RubyModule/*!*/ self, [NotNull]String/*!*/ strScript, int index = 0, RubyArray vals = null)
         {
             try
             {
-                RHODESAPP().processInvokeScript(strScript, index);
+                String[] arr = null;
+                if (null != vals && 0 < vals.Count)
+                {
+                    arr = new String[vals.Count];
+                    int ind = -1;
+                    foreach (object val in vals)
+                        if (val is MutableString)
+                            arr[++ind] = val.ToString();
+                }
+
+                RHODESAPP().processInvokeScriptArgs(strScript, arr, index);
             }
             catch (Exception ex)
             {

data/platform/wp7/RhoRubyLib/sync/SyncSource.cs

@@ -903,6 +903,14 @@ namespace rho.sync
 	            for( ; !attrIter.isEnd(); attrIter.next() )
 	            {
 	                CAttrValue oAttrValue = new CAttrValue(attrIter.getCurKey(),attrIter.getCurString());
+
+                    String strFreezedProps = SyncEngine.getSourceOptions().getProperty(getID(), "freezed");	
+                    if ( strFreezedProps.length() > 0 && strFreezedProps.indexOf(oAttrValue.m_strAttrib) < 0 )	
+                    {	
+                        LOG.INFO("Skip Non-exist property : " + oAttrValue.m_strAttrib + ". For model : " + getName());	
+                        continue;	
+                    }
+
 	                if ( !processBlob(strCmd,strObject,oAttrValue) )
 	                    break;
 	        	
@@ -1092,7 +1100,15 @@ namespace rho.sync
 		
 	        if ( strCmd.compareTo("insert") == 0 )
 	        {
-	            if ( !processBlob(strCmd,strObject,oAttrValue) )
+	            
+                String strFreezedProps = SyncEngine.getSourceOptions().getProperty(getID(), "freezed");
+                if ( strFreezedProps.length() > 0 && strFreezedProps.indexOf(oAttrValue.m_strAttrib) < 0 ) 	
+                {
+                    LOG.INFO("Skip Non-exist property : " + oAttrValue.m_strAttrib + ". For model : " + getName());
+                    return;
+                }
+                
+                if ( !processBlob(strCmd,strObject,oAttrValue) )
 	                return;
 
 	            IDBResult resInsert = getDB().executeSQLReportNonUnique("INSERT INTO object_values "+

data/platform/wp7/RhoRubyLib/views/RhoTabHeader.xaml

@@ -8,11 +8,11 @@
     FontSize="{StaticResource PhoneFontSizeNormal}"
     Foreground="{StaticResource PhoneForegroundBrush}"
     d:DesignHeight="480" d:DesignWidth="480">
-    
-    <Grid x:Name="LayoutRoot">
+
+    <Grid x:Name="LayoutRoot" Background="Transparent">
         <StackPanel Orientation="Horizontal">
             <Image Name="img" Height="auto" Width="auto"/>
-            <TextBlock Name="lbl" Margin="2,0,0,0" Foreground="Black" VerticalAlignment="Center" />
+            <TextBlock Name="lbl" Margin="2,0,0,0"  VerticalAlignment="Center" />
         </StackPanel>
     </Grid>
 </UserControl>

data/platform/wp7/RhoRubyLib/views/RhoView.xaml.cs

@@ -40,6 +40,7 @@ using System.Windows.Navigation;
 using IronRuby.Builtins;
 using rho.common;
 using System.IO;
+using System.Collections;
 
 namespace rho.views
 {
@@ -66,6 +67,8 @@ namespace rho.views
         private bool m_reload = false;
         private bool m_loadFirstTime = true;
         private bool m_masterView = false;
+        private int m_index = -1;
+        private bool m_callback = false;
         
         private const string AJAX_CONTEXT_PARAM = "_rho_callbackId";
         private const string JS_NOTIFY_CONSOLE_LOG = "console.log:";
@@ -94,7 +97,7 @@ namespace rho.views
         }
         
         public RhoView(PhoneApplicationPage mainPage, Grid layoutRoot, String strAction,
-                       bool reload, Brush webBkgColor)
+                       bool reload, Brush webBkgColor, int index)
         {
             InitializeComponent();
             webBrowser1.IsScriptEnabled = true;
@@ -108,6 +111,7 @@ namespace rho.views
             m_strAction = strAction;
             m_layoutRoot = layoutRoot;
             m_reload = reload;
+            m_index = index;
             if (webBkgColor != null)
                 webBrowser1.Background = webBkgColor;
         }
@@ -116,6 +120,7 @@ namespace rho.views
 
         private void WebBrowser_OnLoaded(object sender, RoutedEventArgs e)
         {
+            if (RHODESAPP().Tab != null && RHODESAPP().Tab.SelectedIndex != m_index) return;
             OperatingSystem os = Environment.OSVersion;
             Version vs = os.Version;
             if (vs.Minor < 10) m_reload = true;
@@ -129,18 +134,18 @@ namespace rho.views
             RHODESAPP().BackHistory = m_backHistory;
             RHODESAPP().ForwardHistory = m_forwardHistory;
             RHODESAPP().CurrentUri = m_currentUri;
-            if ( ((!m_loadFirstTime && m_reload) || m_loadFirstTime) && m_strAction != null)
+            if (((!m_loadFirstTime && m_reload) || m_loadFirstTime) && m_strAction != null)
             {
                 if (m_loadFirstTime)
                     m_loadFirstTime = false;
-                bool callback = false;
+                //bool callback = false;
                 if (m_strAction.startsWith("callback:"))
                 {
                     m_strAction = m_strAction.substring(9);
-                    callback = true;
+                    m_callback = true;
                 }
                 m_strAction = RHODESAPP().canonicalizeRhoUrl(m_strAction);
-                if (callback)
+                if (m_callback)
                 {
                     RhoClassFactory.createNetRequest().pushData(m_strAction, "rho_callback=1", null);
                 }
@@ -201,11 +206,46 @@ namespace rho.views
             {
                 string req = request.substring(JS_NOTIFY_REQUEST.length()).trim();
 
-                string ajaxContext = extractAjaxContext(req);
-                if (!RHODESAPP().HttpServer.processBrowserRequest(new Uri(req.substring(REQUEST_URL_SCHEME.length()), UriKind.Relative), ajaxContext))
+                IDictionary res = null;
+                try
                 {
-                    LOG.ERROR("External requests should be filtered in javascript");
+                    res = (IDictionary) fastJSON.RJSONTokener.JsonDecode(req);
                 }
+                catch (Exception ex)
+                {
+                    LOG.ERROR("JsonDecode", ex);
+                    throw ex;
+                }
+
+                if (null != res)
+                {
+                    string url = res["url"].ToString();
+                    string type = res["type"].ToString().toUpperCase();
+                    string contentType = res["contentType"].ToString();
+                    IDictionary headers = (IDictionary)res["headers"];
+                    IDictionary data = (IDictionary)res["data"];
+                    string httpUsername = (null == res["usename"]) ? null : res["usename"].ToString();
+                    string httpPassword = (null == res["password"]) ? null : res["password"].ToString();
+
+                    headers["X-Requested-With"] = "XMLHttpRequest";
+
+                    string ajaxContext = data[AJAX_CONTEXT_PARAM].ToString();
+                    if (!RHODESAPP().HttpServer.processBrowserRequest(
+                        type,
+                        new Uri(url.substring(REQUEST_URL_SCHEME.length()), UriKind.Relative),
+                        headers,
+                        data,
+                        ajaxContext
+                        ))
+                    {
+                        LOG.ERROR("External requests should be filtered in javascript");
+                    }
+                }
+                else
+                {
+                    LOG.ERROR("Empty request URI");
+                }
+
             }
         }
 

data/rakefile.rb

@@ -263,6 +263,8 @@ namespace "config" do
        $app_config[$config["platform"]]["capabilities"] and $app_config[$config["platform"]]["capabilities"].is_a? Array
     $app_config["capabilities"] = capabilities
 
+    application_build_configs = {}
+
     #Process motorola extensions
     if capabilities.index("motorola")
         $app_config["capabilities"] += ["webkit_browser"] if $app_config["extensions"].index("webkit-browser")
@@ -272,6 +274,17 @@ namespace "config" do
         $app_config["extensions"][idx_barcode] = "barcode-moto" if idx_barcode
 
         $app_config["capabilities"] += ["barcode"] if $app_config["extensions"].index("barcode-moto")
+        
+        #check for RE2 plugins
+        plugins = ""
+        $app_config["extensions"].each do |ext|
+            if ( ext.start_with?('moto-') )
+                plugins += ',' if plugins.length() > 0
+                plugins += ext[5, ext.length()-5]
+            end
+        end
+        
+        application_build_configs['moto-plugins'] = plugins if plugins.length() > 0
     end
 
     puts "$app_config['extensions'] : #{$app_config['extensions'].inspect}"   
@@ -279,9 +292,7 @@ namespace "config" do
     
     $hidden_app = $app_config["hidden_app"].nil?() ? "0" : $app_config["hidden_app"]
     
-
     #application build configs
-    application_build_configs = {}
 
     $application_build_configs_keys.each do |key|
       value = $app_config[key]

data/res/build-tools/iphonesim/iphonesim.xcodeproj/project.pbxproj

@@ -11,6 +11,10 @@
 		2481364D115A750000E3A9BA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 24813649115A750000E3A9BA /* main.m */; };
 		2481364E115A750000E3A9BA /* nsprintf.m in Sources */ = {isa = PBXBuildFile; fileRef = 2481364B115A750000E3A9BA /* nsprintf.m */; };
 		8DD76F9C0486AA7600D96B5E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB779EFE84155DC02AAC07 /* Foundation.framework */; };
+		FA42B43A14F58CC60046CED1 /* iPhoneSimulator.m in Sources */ = {isa = PBXBuildFile; fileRef = 24813648115A750000E3A9BA /* iPhoneSimulator.m */; };
+		FA42B43B14F58CC60046CED1 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 24813649115A750000E3A9BA /* main.m */; };
+		FA42B43C14F58CC60046CED1 /* nsprintf.m in Sources */ = {isa = PBXBuildFile; fileRef = 2481364B115A750000E3A9BA /* nsprintf.m */; };
+		FA42B43E14F58CC60046CED1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB779EFE84155DC02AAC07 /* Foundation.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -23,6 +27,15 @@
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 		};
+		FA42B43F14F58CC60046CED1 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 8;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
@@ -35,6 +48,7 @@
 		32A70AAB03705E1F00C91783 /* iphonesim_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iphonesim_Prefix.pch; sourceTree = "<group>"; };
 		8DD76FA10486AA7600D96B5E /* iphonesim */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = iphonesim; sourceTree = BUILT_PRODUCTS_DIR; };
 		FA28F9AE12B9946000597425 /* iPhoneSimulatorRemoteClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iPhoneSimulatorRemoteClient.h; path = iPhoneSimulatorRemoteClient/iPhoneSimulatorRemoteClient.h; sourceTree = "<group>"; };
+		FA42B44314F58CC60046CED1 /* iphonesim_43 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = iphonesim_43; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -46,6 +60,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		FA42B43D14F58CC60046CED1 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				FA42B43E14F58CC60046CED1 /* Foundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -85,6 +107,7 @@
 			isa = PBXGroup;
 			children = (
 				8DD76FA10486AA7600D96B5E /* iphonesim */,
+				FA42B44314F58CC60046CED1 /* iphonesim_43 */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -110,6 +133,24 @@
 			productReference = 8DD76FA10486AA7600D96B5E /* iphonesim */;
 			productType = "com.apple.product-type.tool";
 		};
+		FA42B43814F58CC60046CED1 /* iphonesim_43 */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = FA42B44014F58CC60046CED1 /* Build configuration list for PBXNativeTarget "iphonesim_43" */;
+			buildPhases = (
+				FA42B43914F58CC60046CED1 /* Sources */,
+				FA42B43D14F58CC60046CED1 /* Frameworks */,
+				FA42B43F14F58CC60046CED1 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = iphonesim_43;
+			productInstallPath = "$(HOME)/bin";
+			productName = iphonesim;
+			productReference = FA42B44314F58CC60046CED1 /* iphonesim_43 */;
+			productType = "com.apple.product-type.tool";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
@@ -130,6 +171,7 @@
 			projectRoot = "";
 			targets = (
 				8DD76F960486AA7600D96B5E /* iphonesim */,
+				FA42B43814F58CC60046CED1 /* iphonesim_43 */,
 			);
 		};
 /* End PBXProject section */
@@ -145,6 +187,16 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		FA42B43914F58CC60046CED1 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				FA42B43A14F58CC60046CED1 /* iPhoneSimulator.m in Sources */,
+				FA42B43B14F58CC60046CED1 /* main.m in Sources */,
+				FA42B43C14F58CC60046CED1 /* nsprintf.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin XCBuildConfiguration section */
@@ -165,6 +217,15 @@
 				GCC_PREFIX_HEADER = iphonesim_Prefix.pch;
 				INSTALL_PATH = /usr/local/bin;
 				PRODUCT_NAME = iphonesim;
+				WARNING_LDFLAGS = (
+					"-framework",
+					AppKit,
+					"-F/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks",
+					"-framework",
+					iPhoneSimulatorRemoteClient,
+					"-Wl,-rpath",
+					"-Wl,/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks",
+				);
 			};
 			name = Debug;
 		};
@@ -182,6 +243,15 @@
 				GCC_PREFIX_HEADER = iphonesim_Prefix.pch;
 				INSTALL_PATH = /usr/local/bin;
 				PRODUCT_NAME = iphonesim;
+				WARNING_LDFLAGS = (
+					"-framework",
+					AppKit,
+					"-F/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks",
+					"-framework",
+					iPhoneSimulatorRemoteClient,
+					"-Wl,-rpath",
+					"-Wl,/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks",
+				);
 			};
 			name = Release;
 		};
@@ -236,6 +306,85 @@
 			};
 			name = Release;
 		};
+		FA42B44114F58CC60046CED1 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks\"",
+				);
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = iphonesim_Prefix.pch;
+				INSTALL_PATH = /usr/local/bin;
+				OTHER_LDFLAGS = (
+					"-framework",
+					AppKit,
+					"-F$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks",
+					"-framework",
+					iPhoneSimulatorRemoteClient,
+					"-Wl,-rpath",
+					"-Wl,$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks",
+					"-Wl,-rpath",
+					"-Wl,$(DEVELOPER_DIR)/../OtherFrameworks",
+				);
+				PRODUCT_NAME = iphonesim_43;
+				WARNING_LDFLAGS = (
+					"-framework",
+					AppKit,
+					"-F$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks",
+					"-framework",
+					iPhoneSimulatorRemoteClient,
+					"-Wl,-rpath",
+					"-Wl,$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks",
+					"-Wl,-rpath",
+					"-Wl,$(DEVELOPER_DIR)/../OtherFrameworks",
+				);
+			};
+			name = Debug;
+		};
+		FA42B44214F58CC60046CED1 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks\"",
+				);
+				GCC_MODEL_TUNING = G5;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = iphonesim_Prefix.pch;
+				INSTALL_PATH = /usr/local/bin;
+				OTHER_LDFLAGS = (
+					"-framework",
+					AppKit,
+					"-F$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks",
+					"-framework",
+					iPhoneSimulatorRemoteClient,
+					"-Wl,-rpath",
+					"-Wl,$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks",
+					"-Wl,-rpath",
+					"-Wl,$(DEVELOPER_DIR)/../OtherFrameworks",
+				);
+				PRODUCT_NAME = iphonesim_43;
+				WARNING_LDFLAGS = (
+					"-framework",
+					AppKit,
+					"-F$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks",
+					"-framework",
+					iPhoneSimulatorRemoteClient,
+					"-Wl,-rpath",
+					"-Wl,$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks",
+					"-Wl,-rpath",
+					"-Wl,$(DEVELOPER_DIR)/../OtherFrameworks",
+				);
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -257,6 +406,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		FA42B44014F58CC60046CED1 /* Build configuration list for PBXNativeTarget "iphonesim_43" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				FA42B44114F58CC60046CED1 /* Debug */,
+				FA42B44214F58CC60046CED1 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;