rhodes 3.0.0 → 3.0.1.beta.2

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

@@ -11,6 +11,8 @@ namespace rho.rubyext
     [RubyModule("WebView")]
     public static class RhoWebView
     {
+        private static RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() :
+            new RhoLogger("RhoWebView");
         private static CRhoRuby RhoRuby { get { return CRhoRuby.Instance; } }
         private static CRhodesApp RHODESAPP() { return CRhodesApp.Instance; }
 
@@ -23,25 +25,80 @@ namespace rho.rubyext
         [RubyMethodAttribute("navigate", RubyMethodAttributes.PublicSingleton)]
         public static void Navigate(RubyModule/*!*/ self, [NotNull]String/*!*/ url)
         {
-            RHODESAPP().processWebNavigate(url);
+            try
+            {
+                RHODESAPP().processWebNavigate(url);
+            }
+            catch (Exception ex)
+            {
+                Exception rubyEx = self.Context.CurrentException;
+                if (rubyEx == null)
+                {
+                    rubyEx = RubyExceptionData.InitializeException(new RuntimeError(ex.Message.ToString()), ex.Message);
+                }
+                LOG.ERROR("navigate", ex);
+                throw rubyEx;
+            }
         }
 
         [RubyMethodAttribute("execute_js", RubyMethodAttributes.PublicSingleton)]
         public static void execute_js(RubyModule/*!*/ self, [NotNull]String/*!*/ strScript)
         {
-            RHODESAPP().processInvokeScript(strScript);
+            try
+            {
+                RHODESAPP().processInvokeScript(strScript);
+            }
+            catch (Exception ex)
+            {
+                Exception rubyEx = self.Context.CurrentException;
+                if (rubyEx == null)
+                {
+                    rubyEx = RubyExceptionData.InitializeException(new RuntimeError(ex.Message.ToString()), ex.Message);
+                }
+                LOG.ERROR("execute_js", ex);
+                throw rubyEx;
+            }
         }
 
         [RubyMethodAttribute("current_location", RubyMethodAttributes.PublicSingleton)]
         public static String currentLocation(RubyModule/*!*/ self)
         {
-            return RHODESAPP().getCurrentUrl(0);   
+            String res = "";
+            try
+            {
+                res = RHODESAPP().getCurrentUrl(0);
+            }
+            catch (Exception ex)
+            {
+                Exception rubyEx = self.Context.CurrentException;
+                if (rubyEx == null)
+                {
+                    rubyEx = RubyExceptionData.InitializeException(new RuntimeError(ex.Message.ToString()), ex.Message);
+                }
+                LOG.ERROR("current_location", ex);
+                throw rubyEx;
+            }
+
+            return res;   
         }
 
         [RubyMethodAttribute("set_menu_items", RubyMethodAttributes.PublicSingleton)]
         public static void setMenuItems(RubyModule/*!*/ self, Hash valMenu)
         {
-            RHODESAPP().setMenuItems(valMenu);
+            try
+            {
+                RHODESAPP().setMenuItems(valMenu);
+            }
+            catch (Exception ex)
+            {
+                Exception rubyEx = self.Context.CurrentException;
+                if (rubyEx == null)
+                {
+                    rubyEx = RubyExceptionData.InitializeException(new RuntimeError(ex.Message.ToString()), ex.Message);
+                }
+                LOG.ERROR("set_menu_items", ex);
+                throw rubyEx;
+            }
         }
 
         #endregion

data/platform/wp7/build/wp.rake

@@ -141,7 +141,9 @@ end
 			cp File.join( iron_path, "bin/Silverlight3Release/Microsoft.Scripting.Core.dll" ), iron_release
 		end 
 
-		task :rhodes => ["config:wp", "build:wp:rhobundle"] do
+		task :rhodes do #=> ["config:wp", "build:wp:rhobundle"] do
+		    chdir $startdir
+		    
 		    out_dir = $startdir + "/"+ $config["build"]["wppath"] +"/rhodes"
 			cp $app_path + "/icon/icon.png", out_dir if File.exists? $app_path + "/icon/icon.ico"     
 		
@@ -149,7 +151,7 @@ end
 
 			doc = REXML::Document.new(File.open($startdir+"/"+$config["build"]["wppath"]+"/rhodes/Properties/WMAppManifest.xml"))
 			doc.elements.each("Deployment/App") { 
-			|element| element.attributes["ProductID"] =  "{"+$app_config["wp"]["productid"]+"}"
+			    |element| element.attributes["ProductID"] =  "{"+$app_config["wp"]["productid"]+"}"
 			          element.attributes["Title"] =  $app_config["name"]
 			}
 			File.open($startdir+"/"+$config["build"]["wppath"]+"/rhodes/Properties/WMAppManifest.xml", "w") { |f| doc.write f; f.close }
@@ -167,6 +169,9 @@ end
 			chdir $startdir
 		end 
 
+		task :rhobundle_production => [:rhobundle, :rhobundlemap] do
+        end
+        
 		task :devrhobundleRelease do #=> [:rhobundle, :rhobundlemap, "device:wp:addbundletoxapRelease"] do
 			#out_dir = $startdir + "/" + $vcbindir + "/rhodes/Release/"
 			#doc = REXML::Document.new(File.open(out_dir + "XapCacheFile.xml"))
@@ -174,11 +179,11 @@ end
 			#Dir.glob(File.join("**", '*.*')).each do |f|
 		#		doc.root[1,0] = REXML::Element.new "file lastWriteTime='" + File.mtime(f).strftime("%m/%d/%Y %I:%M:%S %p") + "' source='" + $srcdir.gsub("/", "\\") + "\\" + f.gsub("/", "\\") + "' archivePath='" + f.gsub("/", "\\") + "'" 
 		#	end
-		#	File.open(out_dir + "XapCacheFile.xml", "w") { |f| doc.write f, 2; f.close }
+	#		File.open(out_dir + "XapCacheFile.xml", "w") { |f| doc.write f, 2; f.close }
 			
-		#	chdir $startdir
+	#		chdir $startdir
 
-		#	mkdir_p $config["build"]["wppath"] + "/rhodes/obj/Release" if not File.exists? $config["build"]["wppath"] + "/rhodes/obj/Release"
+	#		mkdir_p $config["build"]["wppath"] + "/rhodes/obj/Release" if not File.exists? $config["build"]["wppath"] + "/rhodes/obj/Release"
 	#		cp out_dir + "XapCacheFile.xml", $config["build"]["wppath"] + "/rhodes/obj/Release"
 		end
 
@@ -260,7 +265,17 @@ end
 		end
 
 		desc "Build production for device or emulator"
-		task :production => ["config:wp","build:wp:rhobundle","build:wp:rhodes"] do
+		task :production => ["build:wp:rhobundle_production","build:wp:rhodes", "device:wp:addbundletoxapRelease"] do
+			#out_dir = $startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/"
+			out_dir = $startdir + "/" + $vcbindir + "/rhodes/Release/"
+			cp  out_dir + "rhodes.xap", out_dir + $appname + ".xap"
+
+			mkdir_p $bindir if not File.exists? $bindir
+			mkdir_p $targetdir if not File.exists? $targetdir
+			mv out_dir + $appname + ".xap", $targetdir
+		end
+
+		task :production_noxap => ["build:wp:rhobundle_production","build:wp:rhodes"] do
 			#out_dir = $startdir + "/" + $vcbindir + "/#{$sdk}" + "/rhodes/Release/"
 			out_dir = $startdir + "/" + $vcbindir + "/rhodes/Release/"
 			cp  out_dir + "rhodes.xap", out_dir + $appname + ".xap"
@@ -275,13 +290,13 @@ end
 
 namespace "clean" do
   desc "Clean wp"
-  task :wp => "clean:wm:all"
-  namespace "wm" do
+  task :wp => "clean:wp:all"
+  namespace "wp" do
     task :rhodes => ["config:wp"] do
       rm_rf $vcbindir
       rm_rf $targetdir
     end
-    task :all => "clean:wm:rhodes"
+    task :all => "clean:wp:rhodes"
   end
 end
 
@@ -292,40 +307,41 @@ namespace "run" do
 		end
 
 		desc "Build, install .xap and run on WP7 emulator"
-		task :wp => ["clean:wm:all", "device:wp:production"] do
-		if $app_config["wp"] && $app_config["wp"]["productid"] != nil
-			#system("START " + $wp7logserver + " " + $app_path + "/rholog.txt")
-
-			File.delete($app_path + "/started") if File.exists?($app_path + "/started")
-			run_rho_log_server()
-			puts "RhoLogServer is starting"
-			while(1)
-			    if File.exists?($app_path + "/started")
-				    break
-			    end
-			end
+		task :wp => ["device:wp:production_noxap"] do
+		
+		    if $app_config["wp"] && $app_config["wp"]["productid"] != nil
+			    #system("START " + $wp7logserver + " " + $app_path + "/rholog.txt")
 
-			Rake::Task["device:wp:addbundletoxapRelease"].invoke
-			out_dir = $startdir + "/" + $vcbindir + "/rhodes/Release/"
-			cp  out_dir + "rhodes.xap", out_dir + $appname + ".xap"
-			mv out_dir + $appname + ".xap", $targetdir
+			    File.delete($app_path + "/started") if File.exists?($app_path + "/started")
+			    run_rho_log_server()
+			    puts "RhoLogServer is starting"
+			    while(1)
+			        if File.exists?($app_path + "/started")
+				        break
+			        end
+			    end
 
-			args = []
-			args << $app_config["wp"]["productid"]
-			args << $app_config["name"]
-			args << $app_path + "/icon/icon.png"
-			args << $targetdir + "/" + $appname + ".xap"
-			args << "emu"
-			puts Jake.run($wp7runner, args)
-
-			#while(1)
-			#	sleep(1000)
-			#end
-			#$rhologfile.close
-		else
-			puts "productid must be set in build.yml"
-			puts "productid's format is xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-		end
+			    Rake::Task["device:wp:addbundletoxapRelease"].invoke
+			    out_dir = $startdir + "/" + $vcbindir + "/rhodes/Release/"
+			    cp  out_dir + "rhodes.xap", out_dir + $appname + ".xap"
+			    mv out_dir + $appname + ".xap", $targetdir
+
+			    args = []
+			    args << $app_config["wp"]["productid"]
+			    args << $app_config["name"]
+			    args << $app_path + "/icon/icon.png"
+			    args << $targetdir + "/" + $appname + ".xap"
+			    args << "emu"
+			    puts Jake.run($wp7runner, args)
+
+			    #while(1)
+			    #	sleep(1000)
+			    #end
+			    #$rhologfile.close
+		    else
+			    puts "productid must be set in build.yml"
+			    puts "productid's format is xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+		    end
 
 		end
 
@@ -367,39 +383,40 @@ namespace "run" do
 			end
 
 			desc "Build, install .xap and run on WP7 device"
-			task :device => ["clean:wm:all", "device:wp:production"] do
-			if $app_config["wp"] && $app_config["wp"]["productid"] != nil
-			    #system("START " + $wp7logserver + " " + $app_path + "/rholog.txt")
-				File.delete($app_path + "/started")  if File.exists?($app_path + "/started")
-				run_rho_log_server()
-				puts "RhoLogServer is starting"
-				while(1)
-				    if File.exists?($app_path + "/started")
-					    break
+			task :device => ["device:wp:production_noxap"] do
+			
+			    if $app_config["wp"] && $app_config["wp"]["productid"] != nil
+			        #system("START " + $wp7logserver + " " + $app_path + "/rholog.txt")
+				    File.delete($app_path + "/started")  if File.exists?($app_path + "/started")
+				    run_rho_log_server()
+				    puts "RhoLogServer is starting"
+				    while(1)
+				        if File.exists?($app_path + "/started")
+					        break
+				        end
 				    end
-				end
 
-				Rake::Task["device:wp:addbundletoxapRelease"].invoke
-				out_dir = $startdir + "/" + $vcbindir + "/rhodes/Release/"
-				cp  out_dir + "rhodes.xap", out_dir + $appname + ".xap"
-				mv out_dir + $appname + ".xap", $targetdir
-
-				args = []
-				args << $app_config["wp"]["productid"]
-				args << $app_config["name"]
-				args << $app_path + "/icon/icon.png"
-				args << $targetdir + "/" + $appname + ".xap"
-				args << "dev"
-				puts Jake.run($wp7runner, args)
-
-				#while(1)
-				#	sleep(1000)
-				#end
-				#$rhologfile.close
-			else
-				puts "productid must be set in build.yml"
-				puts "productid's format is xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-			end
+				    Rake::Task["device:wp:addbundletoxapRelease"].invoke
+				    out_dir = $startdir + "/" + $vcbindir + "/rhodes/Release/"
+				    cp  out_dir + "rhodes.xap", out_dir + $appname + ".xap"
+				    mv out_dir + $appname + ".xap", $targetdir
+
+				    args = []
+				    args << $app_config["wp"]["productid"]
+				    args << $app_config["name"]
+				    args << $app_path + "/icon/icon.png"
+				    args << $targetdir + "/" + $appname + ".xap"
+				    args << "dev"
+				    puts Jake.run($wp7runner, args)
+
+				    #while(1)
+				    #	sleep(1000)
+				    #end
+				    #$rhologfile.close
+			    else
+				    puts "productid must be set in build.yml"
+				    puts "productid's format is xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+			    end
 			end
 		end
 end

data/platform/wp7/rhodes/App.xaml.cs

@@ -87,7 +87,7 @@ namespace Rhodes
         // This code will not execute when the application is deactivated
         private void Application_Closing(object sender, ClosingEventArgs e)
         {
-            RHODESAPP().stopApp();
+            RHODESAPP().closeApp();
            // m_logThread.CancelAsync();
         }
 

data/rakefile.rb

@@ -518,14 +518,18 @@ end
 def process_exclude_folders
   excl = []
 
+  exclude_platform = $config['platform']
+  exclude_platform = "bb6" if $bb6
+  exclude_platform = "wm" if exclude_platform == 'win32'
+
   if $app_config["excludedirs"]
       excl << $app_config["excludedirs"]['all'] if $app_config["excludedirs"]['all']
-      excl << $app_config["excludedirs"][$config["platform"]] if $app_config["excludedirs"][$config["platform"]]
+      excl << $app_config["excludedirs"][exclude_platform] if $app_config["excludedirs"][exclude_platform]
   end
       
   if  $config["excludedirs"]    
       excl << $config["excludedirs"]['all'] if $config["excludedirs"]['all']
-      excl << $config["excludedirs"][$config["platform"]] if $config["excludedirs"][$config["platform"]]
+      excl << $config["excludedirs"][exclude_platform] if $config["excludedirs"][exclude_platform]
   end  
   
   if excl
@@ -684,6 +688,9 @@ namespace "build" do
 
       rm "#{$srcdir}/bb.rb"
 
+      chdir $srcdir
+      Dir.glob("**/*.erb") { |f| rm f }
+
 	  chdir startdir
       cp_r "platform/shared/db/res/db", $srcdir 
     end

data/rhodes.gemspec

@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
 
 Gem::Specification.new do |s|
   s.name = %q{rhodes}
-  s.version = Rhodes::VERSION
+  s.version = "3.0.1.beta.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]
@@ -14,8 +14,6 @@ Gem::Specification.new do |s|
   files = Array.new
   IO.read("Manifest.txt").each_line {|x| files << x.chomp}
   s.files =  files
-  # disable rdoc until we fix the docs
-  s.has_rdoc = false
   s.homepage = %q{http://www.rhomobile.com}
   s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
   s.require_paths = ["lib"]

data/spec/phone_spec/app/spec/asynchttp_spec.rb

@@ -154,8 +154,8 @@ describe "AsyncHttp" do
         res['body'].index('The requested method PUT is not allowed for the URL').should_not be_nil
         
     end    
-    
-    def upload_withbody_test
+
+    it "should upload with body" do
         return unless $is_network_available
         
         server = 'http://rhologs.heroku.com'
@@ -179,7 +179,7 @@ describe "AsyncHttp" do
         File.exists?(file_name).should == true
     end
 
-    def upload_multiple_test
+    it "should upload miltiple" do
         return unless $is_network_available
         
         server = 'http://rhologs.heroku.com'
@@ -209,15 +209,13 @@ describe "AsyncHttp" do
         File.exists?(file_name).should == true
     end
 
-# TODO: Fix this test!
-=begin
-    def httpsget_test
+    it "should send https request" do
         return unless $is_network_available
             
         res = Rho::AsyncHttp.get(
-          :url => 'https://mail.google.com/' )
+          :url => 'https://rhologs.heroku.com' )
         
-        #puts "res : #{res}"  
+        puts "res : #{res}"  
         
         res['status'].should == 'ok'
         
@@ -229,5 +227,5 @@ describe "AsyncHttp" do
         end    
         
     end
-=end
+
 end    

data/spec/phone_spec/app/spec/uri_spec.rb

@@ -0,0 +1,75 @@
+describe "URI" do
+
+    before(:all) do
+        @@file_name = File.join(Rho::RhoApplication::get_base_app_path(), 'local_file.txt')
+        unless File.exists?(@@file_name)
+            write_data  = "this is rhodes test"
+            f = File.new(@@file_name, "w")
+            f.write(write_data)
+            f.close        
+        end
+    end
+
+    after(:all) do
+        File.delete(@@file_name) if File.exists?(@@file_name)
+    end
+
+    it "test navigate local page" do
+        WebView.navigate "/app"
+    end
+
+    it "test navigate external http" do
+        WebView.navigate "http://rhomobile.com/wp-content/themes/rhomobile/img/imgs_21.jpg?rho_open_target=_blanck"
+    end
+
+    it "test navigate local file" do
+        puts "runnuni open local file: #{@@file_name}"
+        WebView.navigate "file://" + @@file_name
+    end
+
+    it "test navigate phone uri" do
+        WebView.navigate "tel:1234567"
+    end
+
+    it "test navigate sms uri" do
+        WebView.navigate "sms:+1234567?body=test%20sms%20message"
+    end
+
+    it "test navigate mailto URI" do
+        WebView.navigate "mailto:dev@rhomobile.com?body=test%20phone%20spec%20mail%20message"
+    end
+
+    it "test navigate video" do
+        WebView.navigate "video.avi"
+    end
+
+    it "test open local page" do
+        WebView.navigate "/app"
+    end
+
+    it "test open external http" do
+        WebView.navigate "http://rhomobile.com/wp-content/themes/rhomobile/img/imgs_21.jpg?rho_open_target=_blanck"
+    end
+
+    it "test open local file" do
+        puts "runnuni open local file: #{@@file_name}"
+        System.open_url "file://" + @@file_name
+    end
+
+    it "test open phone uri" do
+        System.open_url "tel:1234567"
+    end
+
+    it "test open sms uri" do
+        System.open_url "sms:+1234567?body=test%20sms%20message"
+    end
+
+    it "test open mailto URI" do
+        System.open_url "mailto:dev@rhomobile.com?body=test%20phone%20spec%20mail%20message"
+    end
+
+    it "test open video" do
+        System.open_url "video.avi"
+    end
+
+end