rhodes 3.2.0.beta.5 → 3.2.0.beta.6

data/platform/iphone/rbuild/iphone.rake

@@ -589,13 +589,13 @@ namespace "run" do
  	
       # Run local http server
       $iphonespec = true
-      httpserver = false
-      httpserver = true if File.exist? "#{$app_path}/app/spec/library/net/http/http/fixtures/http_server.rb"
+      #httpserver = false
+      #httpserver = true if File.exist? "#{$app_path}/app/spec/library/net/http/http/fixtures/http_server.rb"
 
-      if httpserver
-        require "#{$app_path}/app/spec/library/net/http/http/fixtures/http_server"
-        NetHTTPSpecs.start_server
-      end
+      #if httpserver
+      #  require "#{$app_path}/app/spec/library/net/http/http/fixtures/http_server"
+      #  NetHTTPSpecs.start_server
+      #end
 
       Jake.before_run_spec
 
@@ -658,7 +658,7 @@ namespace "run" do
 
       $stdout.flush
 
-      NetHTTPSpecs.stop_server if httpserver
+      #NetHTTPSpecs.stop_server if httpserver
 
       exit $failed.to_i unless $dont_exit_on_failure
  

data/platform/shared/common/RhodesApp.cpp

@@ -752,14 +752,24 @@ void CRhodesApp::initHttpServer()
 }
 
 const char* CRhodesApp::getFreeListeningPort()
+{
+	if ( m_strListeningPorts.length() > 0 )
+		return m_strListeningPorts.c_str();
+
+    int nFreePort = determineFreeListeningPort();
+    m_strListeningPorts = convertToStringA(nFreePort);
+
+	LOG(INFO) + "Free listening port: " + m_strListeningPorts;
+
+    return m_strListeningPorts.c_str();
+}
+
+int CRhodesApp::determineFreeListeningPort()
 {
     int sockfd = -1;
     sockaddr_in serv_addr = sockaddr_in();
-    int noerrors = 1;
+    int nFreePort = 0, noerrors = 1;
 
-	if ( m_strListeningPorts.length() > 0 )
-		return m_strListeningPorts.c_str();
-	
 	LOG(INFO) + "Trying to get free listening port.";
 	
     sockfd = socket(AF_INET, SOCK_STREAM, 0);
@@ -837,13 +847,12 @@ const char* CRhodesApp::getFreeListeningPort()
         if (getsockname( sockfd, (struct sockaddr *)&serv_addr, &length ) != 0)
         {
             LOG(WARNING) + "Can not get socket info";
-            noerrors = 0;
+            nFreePort = 0;
         }
         else
         {
-            sprintf(buf, "%d", (int)ntohs(serv_addr.sin_port));
-            LOG(INFO) + "Got port to bind on: " + buf;
-            m_strListeningPorts = buf;
+            nFreePort = (int)ntohs(serv_addr.sin_port);
+            LOG(INFO) + "Got port to bind on: " + nFreePort;
         }
     }
     
@@ -854,12 +863,7 @@ const char* CRhodesApp::getFreeListeningPort()
     closesocket(sockfd);
 #endif
 	
-	if ( !noerrors )
-		m_strListeningPorts = "0";
-	
-	LOG(INFO) + "Free listening port: " + m_strListeningPorts;
-	
-	return m_strListeningPorts.c_str();
+	return nFreePort;
 }
 	
 void CRhodesApp::initAppUrls() 

data/platform/shared/common/RhodesApp.h

@@ -153,6 +153,7 @@ public:
 
     void notifyLocalServerStarted();
     const char* getFreeListeningPort();
+    int determineFreeListeningPort();
 
     void setSendingLog(boolean bSending){m_bSendingLog = bSending; }
 protected:

data/platform/shared/rubyext/System.cpp

@@ -112,6 +112,9 @@ VALUE rho_sys_get_property(char* szPropName)
 	if (strcasecmp("rhodes_port",szPropName) == 0) 
         return rho_ruby_create_integer(atoi(RHODESAPP().getFreeListeningPort()));
 
+	if (strcasecmp("free_server_port",szPropName) == 0) 
+        return rho_ruby_create_integer(RHODESAPP().determineFreeListeningPort());
+
 	if (strcasecmp("is_emulator",szPropName) == 0) 
         return rho_ruby_create_boolean(0);
 

data/platform/symbian/build/symbian.rake

@@ -90,6 +90,7 @@ namespace "build" do
      ENV['GCCPATH']= $symbiandir+"/tools/gcce4"
      ENV['DEFALT_MKSPEC_PATH']=$sdkprefix+"/mkspecs/default"
      ENV['QMAKE_PATH']=$sdkprefix+"/bin"
+     ENV['QT_SIS_OPTIONS']="-u"
 
 
      if($ver == "9.4")
@@ -133,6 +134,9 @@ namespace "build" do
      #end
 
      mkdir_p $targetdir if not File.exists? $targetdir
+     rm $targetdir+"/"+$appname+"_unsigned.sis" if File.exists? $targetdir+"/"+$appname+"_unsigned.sis"
+     cp $startdir + "/"+$config["build"]["symbianpath"] + "/rhodes/"+$appname+"_unsigned.sis", $targetdir+"/"+$appname+"_unsigned.sis"
+
      rm $targetdir+"/"+$appname+".sis" if File.exists? $targetdir+"/"+$appname+".sis"
      cp $startdir + "/"+$config["build"]["symbianpath"] + "/rhodes/"+$appname+".sis", $targetdir+"/"+$appname+".sis"
 
@@ -171,9 +175,13 @@ namespace "build" do
      rm_r "db" if File.exists? "db"
      rm_r "lib" if File.exists? "lib"
 
-     mv "rhodes/apps", pwd
-     mv "rhodes/db", pwd
-     mv "rhodes/lib", pwd
+     #mv "rhodes/apps", pwd
+     #mv "rhodes/db", pwd
+     #mv "rhodes/lib", pwd
+
+     cp_r $srcdir + "/apps", pwd
+     cp_r $srcdir + "/db", pwd
+     cp_r $srcdir + "/lib", pwd
 
      cp "rhodes/release/rhodes.exe", pwd if File.exists? "rhodes/release/rhodes.exe"
 
@@ -208,7 +216,7 @@ end
 namespace "device" do
   namespace "symbian" do
     desc "Build production for device"
-    task :production => ["config:symbian","build:symbian:rhobundle","build:symbian:rhodesdev"] do
+    task :production => ["build:symbian:rhobundle","build:symbian:rhodesdev"] do
 
 
 
@@ -245,7 +253,7 @@ namespace "device" do
 end
 
 namespace "run" do
-    task :symbian => ["config:symbian","build:symbian:rhobundle","build:symbian:rhodesemu"] do
+    task :symbian => ["build:symbian:rhobundle","build:symbian:rhodesemu"] do
 
 
 

data/platform/wp7/RhoRubyLib/net/NetRequest.cs

@@ -29,6 +29,8 @@ using System.Net;
 using rho.common;
 using System.Threading;
 using System.Text;
+using IronRuby.Runtime;
+using IronRuby.Builtins;
 using System.IO;
 
 namespace rho.net
@@ -507,7 +509,13 @@ namespace rho.net
             if (pResp.isSuccess())
             {
                 if (m_strCookies == "" && m_strRespBody.Contains("rhoconnect_session"))
-                    m_strCookies = m_strRespBody;
+                {
+                    m_strRespBody = m_strRespBody.Replace('{', ' ');
+                    m_strRespBody = m_strRespBody.Replace('}', ' ');
+                    m_strRespBody = m_strRespBody.Replace('"', ' ');
+                    string[] cookies = m_strRespBody.Split(':');
+                    m_strCookies = cookies[1].Trim();
+                }
                 pResp.setCookies(m_strCookies);
             }
 		

data/rakefile.rb

@@ -1098,6 +1098,12 @@ namespace "run" do
         $appname = $app_config["name"].nil? ? "Rhodes" : $app_config["name"]
         if !File.exists?($path)
             puts "Cannot find RhoSimulator: '#{$path}' does not exists"
+            puts "Check sdk path in build.yml - it should point to latest rhodes (run set-rhodes-sdk in application folder) OR"
+
+            if $config['env']['paths']['rhosimulator'] and $config['env']['paths']['rhosimulator'].length() > 0
+                puts "Check 'env:paths:rhosimulator' path in '<rhodes>/rhobuild.yml' OR"
+            end
+            
             puts "Install Rhodes gem OR"
             puts "Install RhoSimulator and modify 'env:paths:rhosimulator' section in '<rhodes>/rhobuild.yml'"
             exit 1

data/res/generators/templates/application/Rakefile

@@ -10,7 +10,16 @@ $app_config = YAML::load_file("build.yml")
 $app_path = File.expand_path(File.dirname(__FILE__))
 
 if ENV["RHO_HOME"].nil?
-  rakefilepath = "#{$app_config["sdk"]}/Rakefile"
+  if $app_config["sdk"] 
+    rakefilepath = "#{$app_config["sdk"]}/Rakefile"
+  else
+    begin
+      rakefilepath = File.dirname(`get-rhodes-info --rhodes-path`)
+      rakefilepath  = File.join(rakefilepath, "Rakefile")
+    rescue
+      rakefilepath  = ""	
+    end
+  end  
 else
   rakefilepath = "#{ENV["RHO_HOME"]}/Rakefile"
 end

data/res/generators/templates/application/app/layout.erb

@@ -24,7 +24,7 @@
         <link rel="stylesheet" href="/public/jqmobile/jquery.mobile-1.0rc1.min.css">
         <link rel="stylesheet" href="/public/css/jqmobile-patch.css">
         <%% if System::get_property('platform') == 'APPLE' %>
-            <link href="/public/jqmobile/jquery.mobile.iphone.css" type="text/css" rel="stylesheet"/>
+            <link href="/public/jqmobile/jquery-mobile-iphone.css" type="text/css" rel="stylesheet"/>
         <%% end %>
 
         <script type="text/javascript">

data/res/generators/templates/application/build.yml

@@ -1,4 +1,4 @@
-sdk: "<%=@sdk_path%>"
+#sdk: "<%=@sdk_path%>"
 sdkversion: <%=Rhodes::VERSION%>
 name: <%=@app_name%>
 version: 1.0
@@ -9,7 +9,7 @@ wmsdk: "Windows Mobile 6 Professional SDK (ARMV4I)"
 applog: rholog.txt
 iphone:
   configuration: Release
-  sdk: iphonesimulator4.3
+  sdk: iphonesimulator5.0
   provisionprofile:
   codesignidentity:
   entitlements:

data/res/generators/templates/application/public/js/jqmobile-patch.js

@@ -38,7 +38,13 @@
 
         options.success = function(html, textStatus, jqXHR) {
             if (jqXHR.getResponseHeader('Wait-Page')) {
-                // do nothing
+                // We cannot just do nothing on wait-page being received, because
+                // at this moment jQM already have isPageTransitioning lock is set.
+                // Due to this lock is private part of jQM we have no control on it.
+                // So we are going to tag Wait-Page HTML content by some HTML attribute
+                // to detect it in "pagebeforechange" event handler and then perform
+                // preventDefault() to let jQM to release isPageTransitioning lock.
+                origSuccess('<div data-role="page" data-rho-wait-page="true"><!-- intentionally empty --></div>');
             } else {
                 origSuccess(html);
             }
@@ -46,6 +52,20 @@
 
     });
 
+    $(document).bind( "pagebeforechange", function(e, data) {
+        // We only want to handle changePage() calls where the caller is
+        // providing us an already loaded page.
+        if ( !(typeof data.toPage === "string") ) {
+            var pageDiv = data.toPage[0];
+            if ("true" === pageDiv.getAttribute("data-rho-wait-page")) {
+                //Make sure to tell changePage() we've handled this call so it doesn't
+                //have to do anything. So jQM can release isPageTransitioning lock
+                e.preventDefault();
+            }
+        }
+    });
+
+
     //shared page enhancements
 	function enhancePage( $page, role ) {
 		// If a role was specified, make sure the data-role attribute
@@ -134,14 +154,14 @@
 		// reference to an embedded page. If so, it may have been dynamically
 		// injected by a developer, in which case it would be lacking a data-url
 		// attribute and in need of enhancement.
-		if ( page.length === 0 && !path.isPath( dataUrl ) ) {
+		if ( page.length === 0 && dataUrl && !path.isPath( dataUrl ) ) {
 			page = settings.pageContainer.children( "#" + dataUrl )
 				.attr( "data-" + $.mobile.ns + "url", dataUrl )
 		}
 
 		// If we failed to find a page in the DOM, check the URL to see if it
 		// refers to the first page in the application.
-		if ( page.length === 0 && $.mobile.firstPage && path.isFirstPageUrl( absUrl ) ) {
+		if ( page.length === 0 && $.mobile.firstPage && absUrl && path.isFirstPageUrl( absUrl ) ) {
 			page = $( $.mobile.firstPage );
 		}
 
@@ -276,18 +296,6 @@
             // wait for page creation to leverage options defined on widget
             page.one( 'pagecreate', $.mobile._bindPageRemove );
 
-/*
-            page.one('pagecreate', function(){
-
-                // when dom caching is not enabled bind to remove the page on hide
-                if( !page.data("page").options.domCache ){
-                    page.bind( "pagehide.remove", function(){
-                        $(this).remove();
-                    });
-                }
-            });
-*/
-
             enhancePage( page, settings.role );
 
             // Enhancing the page may result in new dialogs/sub pages being inserted
@@ -319,11 +327,6 @@
     $.mobile.loadPage.defaults = original_loadPage.defaults;
 
     function insertAsyncPage(data) {
-        //setTimeout(function(){
-        //    /*$('.waiting').remove();*/
-        //    $.mobile.hidePageLoadingMsg();
-        //},450);
-
         $.mobile.loadPage("inline://", {html: data})
             .done(function( url, options, newPage, dupCachedPage ) {
                 options.duplicateCachedPage = dupCachedPage;

data/spec/framework_spec/app/spec/library/digest/sha1/file_spec.rb

@@ -33,9 +33,9 @@ describe "Digest::SHA1.file" do
 
   it_behaves_like :file_read_directory, :file, Digest::SHA1
 
-  it 'raises a Errno::ENOENT when passed a path that does not exist' do
-    lambda { Digest::SHA1.file("") }.should raise_error(Errno::ENOENT)
-  end
+  #it 'raises a Errno::ENOENT when passed a path that does not exist' do
+  #  lambda { Digest::SHA1.file("") }.should raise_error(Errno::ENOENT)
+  #end
 
   it 'raises a TypeError when passed nil' do
     lambda { Digest::SHA1.file(nil) }.should raise_error(TypeError)

data/spec/framework_spec/app/spec/library/net/http/http/Proxy_spec.rb

@@ -1,5 +1,6 @@
 require File.expand_path('../../../../../spec_helper', __FILE__)
 require 'net/http'
+require File.expand_path('../fixtures/http_server', __FILE__)
 
 describe "Net::HTTP.Proxy" do
   it "returns a new subclass of Net::HTTP" do
@@ -22,14 +23,14 @@ end
 describe "Net::HTTP#proxy?" do
   describe "when self is no proxy class instance" do
     it "returns false" do
-      Net::HTTP.new("127.0.0.1", 3454).proxy?.should be_false
+      Net::HTTP.new("127.0.0.1", NetHTTPSpecs.server_port).proxy?.should be_false
     end
   end
 
   describe "when self is a proxy class instance" do
     it "returns false" do
       http_with_proxy = Net::HTTP.Proxy("127.0.0.1", 1234, "rspec", "rocks")
-      http_with_proxy.new("127.0.0.1", 3454).proxy?.should be_true
+      http_with_proxy.new("127.0.0.1", NetHTTPSpecs.server_port).proxy?.should be_true
     end
   end
 end

data/spec/framework_spec/app/spec/library/net/http/http/copy_spec.rb

@@ -12,7 +12,7 @@ describe "Net::HTTP#copy" do
   end
 
   before(:each) do
-    @http = Net::HTTP.start("127.0.0.1", 3454)
+    @http = Net::HTTP.start("127.0.0.1", NetHTTPSpecs.server_port)
   end
 
   it "sends a COPY request to the passed path and returns the response" do

data/spec/framework_spec/app/spec/library/net/http/http/delete_spec.rb

@@ -12,7 +12,7 @@ describe "Net::HTTP#delete" do
   end
 
   before(:each) do
-    @http = Net::HTTP.start("127.0.0.1", 3454)
+    @http = Net::HTTP.start("127.0.0.1", NetHTTPSpecs.server_port)
   end
 
   it "sends a DELETE request to the passed path and returns the response" do

data/spec/framework_spec/app/spec/library/net/http/http/finish_spec.rb

@@ -12,7 +12,7 @@ describe "Net::HTTP#finish" do
   end
 
   before(:each) do
-    @http = Net::HTTP.new("127.0.0.1", 3454)
+    @http = Net::HTTP.new("127.0.0.1", NetHTTPSpecs.server_port)
   end
 
   describe "when self has been started" do

data/spec/framework_spec/app/spec/library/net/http/http/fixtures/http_server.rb

@@ -49,39 +49,45 @@ module NetHTTPSpecs
   end
 
   class << self
-    @server = nil
-
+    @@server = nil
+    @@server_port = 0
+    
+    def server_port
+        @@server_port
+    end
+    
     def start_server
-      unless @server
+      unless @@server
+        @@server_port = System::get_property('free_server_port')
         server_config = {
           :BindAddress => "127.0.0.1",
-          :Port => 3454,
+          :Port => @@server_port, #NetHTTPSpecs.server_port,
           :Logger => WEBrick::Log.new(NullWriter.new),
           :AccessLog => [],
           :ShutdownSocketWithoutClose => true,
           :ServerType => Thread
         }
 
-        @server = WEBrick::HTTPServer.new(server_config)
+        @@server = WEBrick::HTTPServer.new(server_config)
 
-        @server.mount_proc('/') do |req, res|
+        @@server.mount_proc('/') do |req, res|
           res.content_type = "text/plain"
           res.body = "This is the index page."
         end
-        @server.mount('/request', RequestServlet)
-        @server.mount("/request/body", RequestBodyServlet)
-        @server.mount("/request/header", RequestHeaderServlet)
+        @@server.mount('/request', RequestServlet)
+        @@server.mount("/request/body", RequestBodyServlet)
+        @@server.mount("/request/header", RequestHeaderServlet)
 
-        @server.start
+        @@server.start
       end
 
       # On initial startup or if we re-enter, we wait until the
       # server is really running.
-      Thread.pass until @server.status == :Running
+      Thread.pass until @@server.status == :Running
     end
 
     def shutdown_server
-      @server.shutdown if @server
+      @@server.shutdown if @@server
     end
 
     def stop_server