rhodes 3.3.1 → 3.3.2.beta.1

data/platform/wp7/RhoRubyExtGen/RhoAlert.cs

@@ -0,0 +1,73 @@
+/*------------------------------------------------------------------------
+* (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
+*------------------------------------------------------------------------*/
+
+using Microsoft.Scripting.Utils;
+using Microsoft.Scripting.Runtime;
+using IronRuby.Runtime;
+using IronRuby.Builtins;
+using System;
+using System.Runtime.InteropServices;
+
+namespace rho.rubyext
+{
+    [RubyModule("Alert")]
+    public static class RhoAlert
+    {
+        #region Private Implementation Details
+
+        #endregion
+
+        #region Private Instance & Singleton Methods
+
+        [RubyMethodAttribute("show_popup", RubyMethodAttributes.PublicSingleton)]
+        public static void ShowPopup(RubyModule/*!*/ self, Hash args)
+        {
+
+        }
+
+        [RubyMethodAttribute("hide_popup", RubyMethodAttributes.PublicSingleton)]
+        public static void HidePopup(RubyModule/*!*/ self)
+        {
+        }
+
+        [RubyMethodAttribute("vibrate", RubyMethodAttributes.PublicSingleton)]
+        public static void Vibrate(RubyModule/*!*/ self, int duration)
+        {
+        }
+
+        [RubyMethodAttribute("play_file", RubyMethodAttributes.PublicSingleton)]
+        public static void PlayFile(RubyModule/*!*/ self, [NotNull]String/*!*/ fileName, [NotNull]String/*!*/ mediaType)
+        {
+        }
+
+        [RubyMethodAttribute("show_status", RubyMethodAttributes.PublicSingleton)]
+        public static void ShowStatus(RubyModule/*!*/ self, [NotNull]String/*!*/ title, [NotNull]String/*!*/ text, String/*!*/ hideLabel)
+        {
+        }
+
+        #endregion
+    }
+}

data/platform/wp7/RhoRubyExtGen/RhoRubyExtGen.csproj

@@ -53,6 +53,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="RhoAlert.cs" />
     <Compile Include="RhoAsyncHttp.cs" />
     <Compile Include="RhoCamera.cs" />
     <Compile Include="RhoConfig.cs" />

data/platform/wp7/RhoRubyExtGen/RhoSyncEngine.cs

@@ -37,28 +37,28 @@ namespace rho.rubyext
     public static class RhoSyncEngine
     {
         [RubyMethod("dosync", RubyMethodAttributes.PublicSingleton)]
-        public static object dosync(RubyModule/*!*/ self)
+        public static object dosync(RubyModule/*!*/ self, RubyArray args)
         {
             return null;
         }
 
-        [RubyMethod("dosync", RubyMethodAttributes.PublicSingleton)]
-        public static object dosync(RubyModule/*!*/ self, bool/*!*/ show_status_popup)
+        /*[RubyMethod("dosync", RubyMethodAttributes.PublicSingleton)]
+        public static object dosync(RubyModule self, bool show_status_popup)
         {
             return null;
-        }
+        }*/
 
         [RubyMethod("dosync_source", RubyMethodAttributes.PublicSingleton)]
-        public static object dosync_source(RubyModule/*!*/ self, [NotNull]object/*!*/ srcID)
+        public static object dosync_source(RubyModule/*!*/ self, RubyArray args)
         {
             return null;
         }
 
-        [RubyMethod("dosync_source", RubyMethodAttributes.PublicSingleton)]
-        public static object dosync_source(RubyModule/*!*/ self, [NotNull]object/*!*/ srcID, bool/*!*/ show_status_popup)
+        /*[RubyMethod("dosync_source", RubyMethodAttributes.PublicSingleton)]
+        public static object dosync_source(RubyModule self, [NotNull]object srcID, bool show_status_popup)
         {
             return null;
-        }
+        }*/
 
         [RubyMethod("dosearch", RubyMethodAttributes.PublicSingleton)]
         public static object dosearch(RubyModule/*!*/ self, [NotNull]RubyArray/*!*/ arSources, [NotNull]String/*!*/ from, [NotNull]String/*!*/ strParams,

data/platform/wp7/RhoRubyLib/Initializers.Generated.cs

@@ -26,6 +26,8 @@ namespace rho.rubyext {
             IronRuby.Builtins.RubyClass classRef0 = GetClass(typeof(System.Object));
             
             
+            DefineGlobalModule("Alert", typeof(rho.rubyext.RhoAlert), 0x00000008, null, LoadAlert_Class, null, IronRuby.Builtins.RubyModule.EmptyArray);
+            DefineGlobalModule("Camera", typeof(rho.rubyext.RhoCamera), 0x00000008, null, LoadCamera_Class, null, IronRuby.Builtins.RubyModule.EmptyArray);
             DefineGlobalModule("NativeBar", typeof(rho.rubyext.RhoNativeBar), 0x00000008, null, LoadNativeBar_Class, null, IronRuby.Builtins.RubyModule.EmptyArray);
             IronRuby.Builtins.RubyModule def3 = DefineGlobalModule("Rho", typeof(rho.rubyext.RhoRoot), 0x00000008, null, null, null, IronRuby.Builtins.RubyModule.EmptyArray);
             IronRuby.Builtins.RubyModule def1 = DefineGlobalModule("Rho", typeof(rho.rubyext.Rho), 0x00000008, null, null, null, IronRuby.Builtins.RubyModule.EmptyArray);
@@ -44,6 +46,47 @@ namespace rho.rubyext {
             SetConstant(def5, "Database", def6);
         }
         
+        private static void LoadAlert_Class(IronRuby.Builtins.RubyModule/*!*/ module) {
+            DefineLibraryMethod(module, "hide_popup", 0x21, 
+                0x00000000U, 
+                new Action<IronRuby.Builtins.RubyModule>(rho.rubyext.RhoAlert.HidePopup)
+            );
+            
+            DefineLibraryMethod(module, "play_file", 0x21, 
+                0x00000006U, 
+                new Action<IronRuby.Builtins.RubyModule, System.String, System.String>(rho.rubyext.RhoAlert.PlayFile)
+            );
+            
+            DefineLibraryMethod(module, "show_popup", 0x21, 
+                0x00000000U, 
+                new Action<IronRuby.Builtins.RubyModule, IronRuby.Builtins.Hash>(rho.rubyext.RhoAlert.ShowPopup)
+            );
+            
+            DefineLibraryMethod(module, "show_status", 0x21, 
+                0x00000006U, 
+                new Action<IronRuby.Builtins.RubyModule, System.String, System.String, System.String>(rho.rubyext.RhoAlert.ShowStatus)
+            );
+            
+            DefineLibraryMethod(module, "vibrate", 0x21, 
+                0x00000000U, 
+                new Action<IronRuby.Builtins.RubyModule, System.Int32>(rho.rubyext.RhoAlert.Vibrate)
+            );
+            
+        }
+        
+        private static void LoadCamera_Class(IronRuby.Builtins.RubyModule/*!*/ module) {
+            DefineLibraryMethod(module, "choose_picture", 0x21, 
+                0x00000002U, 
+                new Action<IronRuby.Builtins.RubyModule, System.String>(rho.rubyext.RhoCamera.choosePicture)
+            );
+            
+            DefineLibraryMethod(module, "take_picture", 0x21, 
+                0x00000002U, 
+                new Action<IronRuby.Builtins.RubyModule, System.String>(rho.rubyext.RhoCamera.takePicture)
+            );
+            
+        }
+        
         private static void LoadNativeBar_Class(IronRuby.Builtins.RubyModule/*!*/ module) {
             DefineLibraryMethod(module, "create", 0x21, 
                 0x00000000U, 
@@ -242,15 +285,13 @@ namespace rho.rubyext {
             );
             
             DefineLibraryMethod(module, "dosync", 0x21, 
-                0x00000000U, 0x00000000U, 
-                new Func<IronRuby.Builtins.RubyModule, System.Object>(rho.rubyext.RhoSyncEngine.dosync), 
-                new Func<IronRuby.Builtins.RubyModule, System.Boolean, System.Object>(rho.rubyext.RhoSyncEngine.dosync)
+                0x00000000U, 
+                new Func<IronRuby.Builtins.RubyModule, IronRuby.Builtins.RubyArray, System.Object>(rho.rubyext.RhoSyncEngine.dosync)
             );
             
             DefineLibraryMethod(module, "dosync_source", 0x21, 
-                0x00000002U, 0x00000002U, 
-                new Func<IronRuby.Builtins.RubyModule, System.Object, System.Object>(rho.rubyext.RhoSyncEngine.dosync_source), 
-                new Func<IronRuby.Builtins.RubyModule, System.Object, System.Boolean, System.Object>(rho.rubyext.RhoSyncEngine.dosync_source)
+                0x00000000U, 
+                new Func<IronRuby.Builtins.RubyModule, IronRuby.Builtins.RubyArray, System.Object>(rho.rubyext.RhoSyncEngine.dosync_source)
             );
             
             DefineLibraryMethod(module, "enable_status_popup", 0x21, 

data/platform/wp7/RhoRubyLib/RhoRuby.cs

@@ -392,6 +392,14 @@ namespace rho
             return MutableString.Create(str);
         }
 
+        public static object CreateSymbol(String name)
+        {
+            if (m_instance != null && m_instance.rubyContext != null)
+                return (object)m_instance.rubyContext.CreateSymbol(name, RubyEncoding.UTF8);
+
+            return (object)name;
+        }
+
         public static Hashtable<String, String> enum_strhash(Object valHash)
         {
             Hashtable<String, String> hash = new Hashtable<String, String>();

data/platform/wp7/RhoRubyLib/RhoRubyLib.csproj

@@ -45,6 +45,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Coding4Fun.Phone.Controls">
+    <HintPath>..\..\..\res\build-tools\Coding4Fun.Phone.Controls.dll</HintPath>
+    </Reference>
     <Reference Include="IronRuby">
       <HintPath>..\ironruby\bin\Silverlight3$(Configuration)\IronRuby.dll</HintPath>
     </Reference>
@@ -118,6 +121,7 @@
     <Compile Include="net\NetRequest.cs" />
     <Compile Include="net\HttpServer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="rubyext\RhoAlert.cs" />
     <Compile Include="rubyext\RhoAsyncHttp.cs" />
     <Compile Include="rubyext\RhoCamera.cs" />
     <Compile Include="rubyext\RhoConfig.cs" />
@@ -168,6 +172,7 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
   <ProjectExtensions />

data/platform/wp7/RhoRubyLib/WP_PlatformAdaptationLayer.cs

@@ -41,6 +41,11 @@ namespace rho
             return CRhoFile.isResourceFileExist(path) || CRhoFile.isFileExist(path);
         }
 
+        public override void DeleteFile(string path, bool deleteReadOnly)
+        {
+            CRhoFile.deleteFile(path);
+        }
+
         public override string GetDirectoryName(string path)
         {
             return Path.GetDirectoryName(CFilePath.removeLastSlash(path));

data/platform/wp7/RhoRubyLib/common/RhoParams.cs

@@ -33,6 +33,7 @@ namespace rho.common
 {
     public class RhoParams
     {
+
         protected Object m_pParams;
 
         public RhoParams(Object p)
@@ -52,7 +53,7 @@ namespace rho.common
             
             Object val = null;
             Hash values = (Hash)m_pParams;
-            values.TryGetValue((object)MutableString.Create(name), out val);
+            values.TryGetValue(CRhoRuby.CreateSymbol(name), out val);
             return (val != null) ? val : null;
          }
 

data/platform/wp7/RhoRubyLib/common/RhodesApp.cs

@@ -54,6 +54,7 @@ namespace rho.common
 
         private WebBrowser m_webBrowser;
         private PhoneApplicationPage m_appMainPage;
+        public PhoneApplicationPage MainPage { get { return m_appMainPage; } }
         private Grid m_layoutRoot;
         private TabControl m_tabControl;
         private Stack<Uri> m_backHistory = new Stack<Uri>();
@@ -219,24 +220,30 @@ namespace rho.common
         {
             m_webBrowser.Dispatcher.BeginInvoke( () =>
             {
-                if (index > 0)
-                {
-                    if (m_tabControl != null && m_tabControl.Items.Count > 0)
+                try{
+                    if (index > 0)
+                    {
+                        if (m_tabControl != null && m_tabControl.Items.Count > 0)
+                        {
+                            ((RhoView)((TabItem)m_tabControl.Items[index]).Content).webBrowser1.IsScriptEnabled = true;
+                            if (isExternalUrl(strUrl))
+                                ((RhoView)((TabItem)m_tabControl.Items[index]).Content).webBrowser1.Navigate(new Uri(strUrl, UriKind.Absolute));
+                            else
+                                ((RhoView)((TabItem)m_tabControl.Items[index]).Content).webBrowser1.Navigate(new Uri(strUrl, UriKind.Relative));
+                        }
+                    }
+                    else
                     {
-                        ((RhoView)((TabItem)m_tabControl.Items[index]).Content).webBrowser1.IsScriptEnabled = true;
+                        m_webBrowser.IsScriptEnabled = true;
                         if (isExternalUrl(strUrl))
-                            ((RhoView)((TabItem)m_tabControl.Items[index]).Content).webBrowser1.Navigate(new Uri(strUrl, UriKind.Absolute));
+                            m_webBrowser.Navigate(new Uri(strUrl, UriKind.Absolute));
                         else
-                            ((RhoView)((TabItem)m_tabControl.Items[index]).Content).webBrowser1.Navigate(new Uri(strUrl, UriKind.Relative));
+                            m_webBrowser.Navigate(new Uri(strUrl, UriKind.Relative));
                     }
                 }
-                else
+                catch (Exception exc)
                 {
-                    m_webBrowser.IsScriptEnabled = true;
-                    if (isExternalUrl(strUrl))
-                        m_webBrowser.Navigate(new Uri(strUrl, UriKind.Absolute));
-                    else
-                        m_webBrowser.Navigate(new Uri(strUrl, UriKind.Relative));
+                    LOG.ERROR("WebView.navigate failed : " + strUrl + ", index: " + index, exc);
                 }
             });
         }
@@ -245,16 +252,23 @@ namespace rho.common
         {
             m_webBrowser.Dispatcher.BeginInvoke(() =>
             {
-                if (index > 0)
+                try
                 {
-                    if (m_tabControl != null && m_tabControl.Items.Count > 0)
+                    if (index > 0)
+                    {
+                        if (m_tabControl != null && m_tabControl.Items.Count > 0)
+                        {
+                            ((RhoView)((TabItem)m_tabControl.Items[index]).Content).webBrowser1.Navigate(m_webBrowser.Source);
+                        }
+                    }
+                    else
                     {
-                        ((RhoView)((TabItem)m_tabControl.Items[index]).Content).webBrowser1.Navigate(m_webBrowser.Source);
+                        m_webBrowser.Navigate(m_webBrowser.Source);
                     }
                 }
-                else
+                catch (Exception exc)
                 {
-                    m_webBrowser.Navigate(m_webBrowser.Source);
+                    LOG.ERROR("WebView.refresh failed : " + index, exc);
                 }
             });
         }
@@ -277,16 +291,23 @@ namespace rho.common
 
             m_webBrowser.Dispatcher.BeginInvoke(() =>
             {
-                if (index > 0)
+                try
                 {
-                    if (m_tabControl != null && m_tabControl.Items.Count > 0)
+                    if (index > 0)
                     {
-                        ((RhoView)((TabItem)m_tabControl.Items[index]).Content).webBrowser1.InvokeScript(arr[0], arrParams);
+                        if (m_tabControl != null && m_tabControl.Items.Count > 0)
+                        {
+                            ((RhoView)((TabItem)m_tabControl.Items[index]).Content).webBrowser1.InvokeScript(arr[0], arrParams);
+                        }
+                    }
+                    else
+                    {
+                        m_webBrowser.InvokeScript(arr[0], arrParams);
                     }
                 }
-                else
+                catch (Exception exc)
                 {
-                    m_webBrowser.InvokeScript(arr[0], arrParams);
+                    LOG.ERROR("WebView.execute_js failed: " + arr[0] + "(" + String.Join(",", arrParams), exc);
                 }
             });
         }
@@ -369,11 +390,11 @@ namespace rho.common
                     object val = null;
 
                     Hash values = (Hash)hashArray[i];
-                    if (values.TryGetValue((object)MutableString.Create("action"), out val))
+                    if (values.TryGetValue(CRhoRuby.CreateSymbol("action"), out val))
                         action = val.ToString();
-                    if (values.TryGetValue((object)MutableString.Create("icon"), out val))
+                    if (values.TryGetValue(CRhoRuby.CreateSymbol("icon"), out val))
                         icon = val.ToString();
-                    if (values.TryGetValue((object)MutableString.Create("label"), out val))
+                    if (values.TryGetValue(CRhoRuby.CreateSymbol("label"), out val))
                         label = val.ToString();
 
                     if (label == null && barType == 0)
@@ -462,10 +483,10 @@ namespace rho.common
                 else
                     paramHash = (Hash)barParams;
 
-                if (paramHash != null && paramHash.TryGetValue((object)MutableString.Create("background_color"), out val))
+                if (paramHash != null && paramHash.TryGetValue(CRhoRuby.CreateSymbol("background_color"), out val))
                     m_appMainPage.ApplicationBar.BackgroundColor = getColorFromString(val.ToString());
 
-                if (paramHash != null && paramHash.TryGetValue((object)MutableString.Create("buttons"), out val) && val is RubyArray)
+                if (paramHash != null && paramHash.TryGetValue(CRhoRuby.CreateSymbol("buttons"), out val) && val is RubyArray)
                     hashArray = ((RubyArray)val).ToArray();
 
                 createToolBarButtons(barType, hashArray);
@@ -643,17 +664,17 @@ namespace rho.common
                     object val = null;
 
                     Hash values = (Hash)hashArray[i];
-                    if (values.TryGetValue((object)MutableString.Create("action"), out val))
+                    if (values.TryGetValue(CRhoRuby.CreateSymbol("action"), out val))
                         action = val.ToString();
-                    if (values.TryGetValue((object)MutableString.Create("icon"), out val))
+                    if (values.TryGetValue(CRhoRuby.CreateSymbol("icon"), out val))
                         icon = val.ToString();
-                    if (values.TryGetValue((object)MutableString.Create("label"), out val))
+                    if (values.TryGetValue(CRhoRuby.CreateSymbol("label"), out val))
                         label = val.ToString();
-                    if (values.TryGetValue((object)MutableString.Create("reload"), out val))
+                    if (values.TryGetValue(CRhoRuby.CreateSymbol("reload"), out val))
                         reload = Convert.ToBoolean(val);
-                    if (values.TryGetValue((object)MutableString.Create("web_bkg_color"), out val))
+                    if (values.TryGetValue(CRhoRuby.CreateSymbol("web_bkg_color"), out val))
                         web_bkg_color = new SolidColorBrush(getColorFromString(val.ToString()));
-                    if (values.TryGetValue((object)MutableString.Create("use_current_view_for_tab"), out val))
+                    if (values.TryGetValue(CRhoRuby.CreateSymbol("use_current_view_for_tab"), out val))
                         use_current_view_for_tab = Convert.ToBoolean(val);
 
                     //if (label == null && barType == 0)
@@ -673,9 +694,9 @@ namespace rho.common
                     tabItem.Header = new RhoTabHeader(label, icon);
                     //if (i == 0)// && use_current_view_for_tab)
                     tabItem.Content = new RhoView(m_appMainPage, m_layoutRoot, action, reload, web_bkg_color);
-                    if (values.TryGetValue((object)MutableString.Create("selected_color"), out val))
+                    if (values.TryGetValue(CRhoRuby.CreateSymbol("selected_color"), out val))
                         tabItem.Background = new SolidColorBrush(getColorFromString(val.ToString()));
-                    if (values.TryGetValue((object)MutableString.Create("disabled"), out val))
+                    if (values.TryGetValue(CRhoRuby.CreateSymbol("disabled"), out val))
                         tabItem.IsEnabled = !Convert.ToBoolean(val);
                     m_tabControl.Items.Add(tabItem);
                 }
@@ -701,10 +722,10 @@ namespace rho.common
                 else
                     paramHash = (Hash)tabBarParams;
 
-                if (paramHash != null && paramHash.TryGetValue((object)MutableString.Create("background_color"), out val))
+                if (paramHash != null && paramHash.TryGetValue(CRhoRuby.CreateSymbol("background_color"), out val))
                     m_tabControl.Background = new SolidColorBrush(getColorFromString(val.ToString()));
 
-                if (paramHash != null && paramHash.TryGetValue((object)MutableString.Create("tabs"), out val) && val is RubyArray)
+                if (paramHash != null && paramHash.TryGetValue(CRhoRuby.CreateSymbol("tabs"), out val) && val is RubyArray)
                     hashArray = ((RubyArray)val).ToArray();
 
                 createTabBarButtons(tabBarType, hashArray);