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

data/lib/extensions/fileutils/fileutils.rb

@@ -1524,6 +1524,9 @@ module FileUtils
     OPT_TABLE.keys.select {|m| OPT_TABLE[m].include?(opt) }
   end
 
+#RHO does not support eval of ruby text only block      
+=begin
+
   LOW_METHODS = singleton_methods(false) - collect_method(:noop).map(&:intern)
   module LowMethods
     module_eval("private\n" + ::FileUtils::LOW_METHODS.map {|name| "def #{name}(*)end"}.join("\n"),
@@ -1532,8 +1535,6 @@ module FileUtils
 
   METHODS = singleton_methods() - [:private_module_function,
       :commands, :options, :have_option?, :options_of, :collect_method]
-#RHO does not support eval of ruby text only block      
-=begin
   # 
   # This module has all methods of FileUtils module, but it outputs messages
   # before acting.  This equates to passing the <tt>:verbose</tt> flag to

data/lib/extensions/hmac/hmac-md5.rb

@@ -0,0 +1,11 @@
+require 'hmac'
+require 'digest/md5'
+
+module HMAC
+  class MD5 < Base
+    def initialize(key = nil)
+      super(Digest::MD5, 64, 16, key)
+    end
+    public_class_method :new, :digest, :hexdigest
+  end
+end

data/lib/extensions/hmac/hmac-rmd160.rb

@@ -0,0 +1,11 @@
+require 'hmac'
+require 'digest/rmd160'
+
+module HMAC
+  class RMD160 < Base
+    def initialize(key = nil)
+      super(Digest::RMD160, 64, 20, key)
+    end
+    public_class_method :new, :digest, :hexdigest
+  end
+end

data/lib/extensions/hmac/hmac-sha1.rb

@@ -0,0 +1,11 @@
+require 'hmac'
+require 'digest/sha1'
+
+module HMAC
+  class SHA1 < Base
+    def initialize(key = nil)
+      super(Digest::SHA1, 64, 20, key)
+    end
+    public_class_method :new, :digest, :hexdigest
+  end
+end

data/lib/extensions/hmac/hmac-sha2.rb

@@ -0,0 +1,25 @@
+require 'hmac'
+require 'digest/sha2'
+
+module HMAC
+  class SHA256 < Base
+    def initialize(key = nil)
+      super(Digest::SHA256, 64, 32, key)
+    end
+    public_class_method :new, :digest, :hexdigest
+  end
+
+  class SHA384 < Base
+    def initialize(key = nil)
+      super(Digest::SHA384, 128, 48, key)
+    end
+    public_class_method :new, :digest, :hexdigest
+  end
+
+  class SHA512 < Base
+    def initialize(key = nil)
+      super(Digest::SHA512, 128, 64, key)
+    end
+    public_class_method :new, :digest, :hexdigest
+  end
+end

data/lib/extensions/hmac/hmac.rb

@@ -0,0 +1,118 @@
+# Copyright (C) 2001  Daiki Ueno <ueno@unixuser.org>
+# This library is distributed under the terms of the Ruby license.
+
+# This module provides common interface to HMAC engines.
+# HMAC standard is documented in RFC 2104:
+#
+#   H. Krawczyk et al., "HMAC: Keyed-Hashing for Message Authentication",
+#   RFC 2104, February 1997
+#
+# These APIs are inspired by JCE 1.2's javax.crypto.Mac interface.
+#
+#   <URL:http://java.sun.com/security/JCE1.2/spec/apidoc/javax/crypto/Mac.html>
+#
+# Source repository is at
+#
+#   http://github.com/topfunky/ruby-hmac/tree/master
+
+module HMAC
+
+  VERSION = '0.4.0'
+
+  class Base
+    def initialize(algorithm, block_size, output_length, key)
+      @algorithm = algorithm
+      @block_size = block_size
+      @output_length = output_length
+      @initialized = false
+      @key_xor_ipad = ''
+      @key_xor_opad = ''
+      set_key(key) unless key.nil?
+    end
+
+    private
+    def check_status
+      unless @initialized
+        raise RuntimeError,
+        "The underlying hash algorithm has not yet been initialized."
+      end
+    end
+
+    public
+    def set_key(key)
+      # If key is longer than the block size, apply hash function
+      # to key and use the result as a real key.
+      key = @algorithm.digest(key) if key.size > @block_size
+      akey = key.unpack("C*")
+      key_xor_ipad = ("\x36" * @block_size).unpack("C*")
+      key_xor_opad = ("\x5C" * @block_size).unpack("C*")
+      for i in 0 .. akey.size - 1
+        key_xor_ipad[i] ^= akey[i]
+        key_xor_opad[i] ^= akey[i]
+      end
+      @key_xor_ipad = key_xor_ipad.pack("C*")
+      @key_xor_opad = key_xor_opad.pack("C*")
+      @md = @algorithm.new
+      @initialized = true
+    end
+
+    def reset_key
+      @key_xor_ipad.gsub!(/./, '?')
+      @key_xor_opad.gsub!(/./, '?')
+      @key_xor_ipad[0..-1] = ''
+      @key_xor_opad[0..-1] = ''
+      @initialized = false
+    end
+
+    def update(text)
+      check_status
+      # perform inner H
+      md = @algorithm.new
+      md.update(@key_xor_ipad)
+      md.update(text)
+      str = md.digest
+      # perform outer H
+      md = @algorithm.new
+      md.update(@key_xor_opad)
+      md.update(str)
+      @md = md
+    end
+    alias << update
+
+    def digest
+      check_status
+      @md.digest
+    end
+
+    def hexdigest
+      check_status
+      @md.hexdigest
+    end
+    alias to_s hexdigest
+
+    # These two class methods below are safer than using above
+    # instance methods combinatorially because an instance will have
+    # held a key even if it's no longer in use.
+    def Base.digest(key, text)
+      hmac = self.new(key)
+      begin
+        hmac.update(text)
+        hmac.digest
+      ensure
+        hmac.reset_key
+      end
+    end
+
+    def Base.hexdigest(key, text)
+      hmac = self.new(key)
+      begin
+        hmac.update(text)
+        hmac.hexdigest
+      ensure
+        hmac.reset_key
+      end
+    end
+
+    private_class_method :new, :digest, :hexdigest
+  end
+end

data/lib/extensions/hmac/ruby_hmac.rb

@@ -0,0 +1,2 @@
+# Convenience file to match gem name
+require 'hmac'

data/lib/extensions/net-http/net/http.rb

@@ -876,7 +876,7 @@ module Net   #:nodoc:
           the_body = r.read_body dest, &block
           case r["content-encoding"]
           when "gzip"
-            r.body= Zlib::GzipReader.new(StringIO.new(the_body), encoding: "ASCII-8BIT").read
+            r.body= Zlib::GzipReader.new(StringIO.new(the_body), encoding => "ASCII-8BIT").read
             r.delete("content-encoding")
           when "deflate"
             r.body= Zlib::Inflate.inflate(the_body);

data/lib/framework/rho/render.rb

@@ -164,7 +164,7 @@ module Rho
       #rho_info 'render content: ' + @content.length.to_s
       if xhr? and options[:use_layout_on_ajax] != true
         options[:layout] = false
-        if @request["headers"]["Transition-Enabled"] == "true"
+        if options[:partial].nil? && @request["headers"]["Transition-Enabled"] == "true"
           @content = "<div>#{@content}</div>"
         end
       elsif options[:layout].nil? or options[:layout] == true

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

@@ -247,7 +247,6 @@ public class RhodesActivity extends BaseActivity {
 	@Override
 	public void onStart() {
 		super.onStart();
-	    RhodesService.rhodesActivityStarted(true);
 
         Log.d(TAG, "RhodesActivity.onStart()");
         mIsInsideStartStop = true;
@@ -278,15 +277,11 @@ public class RhodesActivity extends BaseActivity {
         		iterator.next().onPause(this);
         	}
         }
-    	
-        RhodesApplication.stateChanged(RhodesApplication.UiState.MainActivityPaused);
-
-        RhodesService.rhodesActivityStarted(false);
 
         super.onPause();
         Log.d(TAG, "RhodesActivity.onPause()");
 
-        RhodesService.callUiDestroyedCallback();
+        RhodesApplication.stateChanged(RhodesApplication.UiState.MainActivityPaused);
     }
 
     @Override

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

@@ -37,15 +37,50 @@ public class RhodesApplication extends Application{
 	
     private static final String TAG = RhodesApplication.class.getSimpleName();
     private static Handler mHandler;
-	static {
-		NativeLibraries.load();
-	}
+    static {
+        NativeLibraries.load();
+    }
+    
+    @Override
+    public void onCreate(){
+        super.onCreate();
+
+        RhodesApplication.runWhen(
+                UiState.MainActivityStarted,
+                new StateHandler(false) {
+                    @Override
+                    public void run() {
+                        rhodesActivityStarted(true);
+                    }
+                });
+        RhodesApplication.runWhen(
+                UiState.MainActivityPaused,
+                new StateHandler(false) {
+                    @Override
+                    public void run() {
+                        if (isRhodesActivityStarted()) {
+                            Logger.T(TAG, "callUiDestroyedCallback");
+                            rhodesActivityStarted(false);
+                            RhodesService.callUiDestroyedCallback();
+                        }
+                    }
+                });
+    }
+    private static boolean sRhodesActivityStarted = false;
+
+    synchronized
+    static void rhodesActivityStarted(boolean started) {
+        sRhodesActivityStarted = started;
+    }
+
+    synchronized
+    public static boolean isRhodesActivityStarted() { return sRhodesActivityStarted; }
 
     private native static void createRhodesApp();
     private native static void startRhodesApp();
     private native static void stopRhodesApp();
     private native static boolean canStartApp(String strCmdLine, String strSeparators);
-	
+
     public static void create()
     {
         if (sAppState != AppState.Undefined) {
@@ -56,13 +91,13 @@ public class RhodesApplication extends Application{
     }
 
     public static void start()
-	{
+    {
         if (sAppState != AppState.Undefined) {
             Logger.E(TAG, "Cannot start application it is already started!!!");
             return;
         }
-	    startRhodesApp();
-	}
+        startRhodesApp();
+    }
 
 	public static boolean canStart(String strCmdLine)
 	{
@@ -70,14 +105,23 @@ public class RhodesApplication extends Application{
 	}
 	
     public static void stop() {
-        
+        Logger.T(TAG, "Stopping application");
         mHandler = new Handler();
         mHandler.postDelayed(new Runnable() {
             public void run() {
+                Logger.T(TAG, "do stopRhodesApp");
                 stopRhodesApp();
+                try {
+                    Logger.T(TAG, "do RhodesActivity.finish()");
+                    RhodesActivity.safeGetInstance().finish();
+                } catch (Throwable e) {
+                    // Just postpone
+                }
+                Logger.T(TAG, "send quit signal");
                 Process.sendSignal(Process.myPid(), Process.SIGNAL_QUIT);
                 mHandler.postDelayed(new Runnable() {
                     public void run() {
+                        Logger.T(TAG, "send kill signal");
                         Process.killProcess(Process.myPid());
                     }
                 }, 500);

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

@@ -151,15 +151,6 @@ public class RhodesService extends Service {
 	private static boolean mCameraAvailable;
 	
 	private static int sActivitiesActive;
-	private static boolean sRhodesActivityStarted = false;
-	
-	synchronized
-	static void rhodesActivityStarted(boolean started) {
-	    sRhodesActivityStarted = started;
-	}
-	
-	synchronized
-	public static boolean isRhodesActivityStarted() { return sRhodesActivityStarted; }
 	
 	private boolean mNeedGeoLocationRestart = false;
 	
@@ -614,22 +605,24 @@ public class RhodesService extends Service {
 	}
 
 	public static void exit() {
+        Logger.I(TAG, "Exit application");
         try {
-            RhodesActivity activity = RhodesActivity.getInstance();
-            if (activity != null)
-                activity.finish();
-            
+            // Do this fake state change in order to make processing before server is stopped
+            RhodesApplication.stateChanged(RhodesApplication.UiState.MainActivityPaused);
+
             RhodesService service = RhodesService.getInstance();
             if (service != null)
             {
+                Logger.T(TAG, "stop RhodesService");
                 service.wakeLock.reset();
                 service.stopSelf();
             }
             
+            Logger.T(TAG, "stop RhodesApplication");
             RhodesApplication.stop();
         }
         catch (Exception e) {
-            Logger.E(TAG, e.getMessage());
+            Logger.E(TAG, e);
         }
 	}
 	
@@ -1430,7 +1423,7 @@ public class RhodesService extends Service {
 	}
 
     public static void bringToFront() {
-        if (isRhodesActivityStarted()) {
+        if (RhodesApplication.isRhodesActivityStarted()) {
             Logger.T(TAG, "Main activity is already at front, do nothing");
             return;
         }

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

@@ -45,7 +45,7 @@ public class PerformOnUiThread implements Runnable {
 			runnable.run();
 		}
 		catch (Exception e) {
-			Logger.E(TAG, "Operation failed: " + e.getMessage());
+			Logger.E(TAG, e);
 		}
 		finally {
 			synchronized (runnable) {
@@ -64,7 +64,7 @@ public class PerformOnUiThread implements Runnable {
                             RhodesActivity.safeGetInstance().post(r, delay);
                         }
                         catch (Exception e) {
-                            Logger.E(TAG, "exec failed: " + e.getMessage());
+                            Logger.E(TAG, e);
                             setError(e);
                         }
                     }
@@ -88,7 +88,7 @@ public class PerformOnUiThread implements Runnable {
                         try {
                             RhodesActivity.safeGetInstance().post(r);
                         } catch (Exception e) {
-                            Logger.E(TAG, "exec failed: " + e.getMessage());
+                            Logger.E(TAG, e);
                             setError(e);
                         }
                     }
@@ -117,8 +117,7 @@ public class PerformOnUiThread implements Runnable {
                 }
             }
         } catch (Exception e) {
-            Logger.E(TAG, "exec failed: " + e.getMessage());
-            Thread.dumpStack();
+            Logger.E(TAG, e);
         }
     }
 };

data/platform/android/build/android.rake

@@ -279,7 +279,9 @@ namespace "config" do
     $current_platform = "android"
   end
 
-  task :android => [:set_android_platform, "config:common"] do
+  task :android => :set_android_platform do
+  
+    Rake::Task["config:common"].invoke
 
     $ext_android_rhodes_activity_listener = []
     $ext_android_manifest_changes= []