rhodes 3.3.3.beta.4 → 3.3.3

data/lib/extensions/pdf-writer/transaction/simple/group.rb

@@ -0,0 +1,146 @@
+#--
+# Transaction::Simple
+# Simple object transaction support for Ruby
+# http://rubyforge.org/projects/trans-simple/
+#   Version 1.4.0
+#
+# Licensed under a MIT-style licence. See Licence.txt in the main
+# distribution for full licensing information.
+#
+# Copyright (c) 2003 - 2007 Austin Ziegler
+#
+# $Id: group.rb 47 2007-02-03 15:02:51Z austin $
+#++
+require 'transaction/simple'
+
+  # A transaction group is an object wrapper that manages a group of objects
+  # as if they were a single object for the purpose of transaction
+  # management. All transactions for this group of objects should be
+  # performed against the transaction group object, not against individual
+  # objects in the group.
+  #
+  # == Transaction Group Usage
+  #   require 'transaction/simple/group'
+  #   
+  #   x = "Hello, you."
+  #   y = "And you, too."
+  #   
+  #   g = Transaction::Simple::Group.new(x, y)
+  #   g.start_transaction(:first)     # -> [ x, y ]
+  #   g.transaction_open?(:first)     # -> true
+  #   x.transaction_open?(:first)     # -> true
+  #   y.transaction_open?(:first)     # -> true
+  #   
+  #   x.gsub!(/you/, "world")         # -> "Hello, world."
+  #   y.gsub!(/you/, "me")            # -> "And me, too."
+  #   
+  #   g.start_transaction(:second)    # -> [ x, y ]
+  #   x.gsub!(/world/, "HAL")         # -> "Hello, HAL."
+  #   y.gsub!(/me/, "Dave")           # -> "And Dave, too."
+  #   g.rewind_transaction(:second)   # -> [ x, y ]
+  #   x                               # -> "Hello, world."
+  #   y                               # -> "And me, too."
+  #   
+  #   x.gsub!(/world/, "HAL")         # -> "Hello, HAL."
+  #   y.gsub!(/me/, "Dave")           # -> "And Dave, too."
+  #   
+  #   g.commit_transaction(:second)   # -> [ x, y ]
+  #   x                               # -> "Hello, HAL."
+  #   y                               # -> "And Dave, too."
+  #   
+  #   g.abort_transaction(:first)     # -> [ x, y ]
+  #   x                               = -> "Hello, you."
+  #   y                               = -> "And you, too."
+class Transaction::Simple::Group
+    # Creates a transaction group for the provided objects. If a block is
+    # provided, the transaction group object is yielded to the block; when
+    # the block is finished, the transaction group object will be cleared
+    # with #clear.
+  def initialize(*objects)
+    @objects = objects || []
+    @objects.freeze
+    @objects.each { |obj| obj.extend(Transaction::Simple) }
+
+    if block_given?
+      begin
+        yield self
+      ensure
+        self.clear
+      end
+    end
+  end
+
+    # Returns the objects that are covered by this transaction group.
+  attr_reader :objects
+
+    # Clears the object group. Removes references to the objects so that
+    # they can be garbage collected.
+  def clear
+    @objects = @objects.dup.clear
+  end
+
+    # Tests to see if all of the objects in the group have an open
+    # transaction. See Transaction::Simple#transaction_open? for more
+    # information.
+  def transaction_open?(name = nil)
+    @objects.inject(true) do |val, obj|
+      val = val and obj.transaction_open?(name)
+    end
+  end
+
+    # Returns the current name of the transaction for the group.
+    # Transactions not explicitly named are named +nil+.
+  def transaction_name
+    @objects[0].transaction_name
+  end
+
+    # Starts a transaction for the group. Stores the current object state.
+    # If a transaction name is specified, the transaction will be named.
+    # Transaction names must be unique. Transaction names of +nil+ will be
+    # treated as unnamed transactions.
+  def start_transaction(name = nil)
+    @objects.each { |obj| obj.start_transaction(name) }
+  end
+
+    # Rewinds the transaction. If +name+ is specified, then the intervening
+    # transactions will be aborted and the named transaction will be
+    # rewound. Otherwise, only the current transaction is rewound.
+  def rewind_transaction(name = nil)
+    @objects.each { |obj| obj.rewind_transaction(name) }
+  end
+
+    # Aborts the transaction. Resets the object state to what it was before
+    # the transaction was started and closes the transaction. If +name+ is
+    # specified, then the intervening transactions and the named transaction
+    # will be aborted. Otherwise, only the current transaction is aborted.
+    #
+    # If the current or named transaction has been started by a block
+    # (Transaction::Simple.start), then the execution of the block will be
+    # halted with +break+ +self+.
+  def abort_transaction(name = nil)
+    @objects.each { |obj| obj.abort_transaction(name) }
+  end
+
+    # If +name+ is +nil+ (default), the current transaction level is closed
+    # out and the changes are committed.
+    #
+    # If +name+ is specified and +name+ is in the list of named
+    # transactions, then all transactions are closed and committed until the
+    # named transaction is reached.
+  def commit_transaction(name = nil)
+    @objects.each { |obj| obj.commit_transaction(name) }
+  end
+
+    # Alternative method for calling the transaction methods. An optional
+    # name can be specified for named transaction support.
+    #
+    # #transaction(:start)::  #start_transaction
+    # #transaction(:rewind):: #rewind_transaction
+    # #transaction(:abort)::  #abort_transaction
+    # #transaction(:commit):: #commit_transaction
+    # #transaction(:name)::   #transaction_name
+    # #transaction::          #transaction_open?
+  def transaction(action = nil, name = nil)
+    @objects.each { |obj| obj.transaction(action, name) }
+  end
+end

data/lib/extensions/pdf-writer/transaction/simple/threadsafe.rb

@@ -0,0 +1,68 @@
+#--
+# Transaction::Simple
+# Simple object transaction support for Ruby
+# http://rubyforge.org/projects/trans-simple/
+#   Version 1.4.0
+#
+# Licensed under a MIT-style licence. See Licence.txt in the main
+# distribution for full licensing information.
+#
+# Copyright (c) 2003 - 2007 Austin Ziegler
+#
+# $Id: threadsafe.rb 50 2007-02-03 20:26:19Z austin $
+#++
+require 'transaction/simple'
+require 'thread'
+
+module Transaction
+  # A standard exception for transaction errors involving threadsafe
+  # transactions.
+  class TransactionThreadError < TransactionError; end
+end
+
+  # = Transaction::Simple::ThreadSafe
+  # Thread-safe simple object transaction support for Ruby.
+  # Transaction::Simple::ThreadSafe is used in the same way as
+  # Transaction::Simple. Transaction::Simple::ThreadSafe uses a Mutex object
+  # to ensure atomicity at the cost of performance in threaded applications.
+  #
+  # Transaction::Simple::ThreadSafe will not wait to obtain a lock; if the
+  # lock cannot be obtained immediately, a
+  # Transaction::TransactionThreadError will be raised.
+  #
+  # Thanks to Mauricio Fernandez for help with getting this part working.
+  #
+  # Threadsafe transactions can be used in any place that normal
+  # transactions would. The main difference would be in setup:
+  #
+  #   require 'transaction/simple/threadsafe'
+  #
+  #   x = "Hello, you."
+  #   x.extend(Transaction::Simple::ThreadSafe) # Threadsafe
+  #
+  #   y = "Hello, you."
+  #   y.extend(Transaction::Simple)             # Not threadsafe
+module Transaction::Simple::ThreadSafe
+  include Transaction::Simple
+
+  SKIP_TRANSACTION_VARS = Transaction::Simple::SKIP_TRANSACTION_VARS.dup #:nodoc:
+  SKIP_TRANSACTION_VARS << "@__transaction_mutex__"
+
+  Transaction::Simple.instance_methods(false) do |meth|
+    next if meth == "transaction"
+    arg = "(name = nil)" unless meth == "transaction_name"
+    module_eval <<-EOS
+    def #{meth}#{arg}
+      if (@__transaction_mutex__ ||= Mutex.new).try_lock
+        result = super
+        @__transaction_mutex__.unlock
+        return result
+      else
+        raise TransactionThreadError, Messages[:cannot_obtain_transaction_lock] % meth
+      end
+    ensure
+      @__transaction_mutex__.unlock
+    end
+    EOS
+  end
+end

data/lib/extensions/pdf-writer/transaction/simple/threadsafe/group.rb

@@ -0,0 +1,36 @@
+#--
+# Transaction::Simple
+# Simple object transaction support for Ruby
+# http://rubyforge.org/projects/trans-simple/
+#   Version 1.4.0
+#
+# Licensed under a MIT-style licence. See Licence.txt in the main
+# distribution for full licensing information.
+#
+# Copyright (c) 2003 - 2007 Austin Ziegler
+#
+# $Id: group.rb 47 2007-02-03 15:02:51Z austin $
+#++
+require 'transaction/simple/threadsafe'
+
+  # A transaction group is an object wrapper that manages a group of objects
+  # as if they were a single object for the purpose of transaction
+  # management. All transactions for this group of objects should be
+  # performed against the transaction group object, not against individual
+  # objects in the group. This is the threadsafe version of a transaction
+  # group.
+class Transaction::Simple::ThreadSafe::Group < Transaction::Simple::Group
+  def initialize(*objects)
+    @objects = objects || []
+    @objects.freeze
+    @objects.each { |obj| obj.extend(Transaction::Simple::ThreadSafe) }
+
+    if block_given?
+      begin
+        yield self
+      ensure
+        self.clear
+      end
+    end
+  end
+end

data/lib/framework/dateOrig.rb

@@ -1800,8 +1800,11 @@ class Time
 
   def to_datetime
     jd = DateTime.__send__(:civil_to_jd, year(), mon(), mday(), DateTime::ITALY)
-    fr = DateTime.__send__(:time_to_day_fraction, hour(), min(), [sec(), 59].min) +
+    fr = DateTime.__send__(:time_to_day_fraction, hour(), min(), [sec(), 59].min) 
+if !defined?(RHO_WP7)
+    +
        Rational(subsec(), 86400)
+end       
     of = Rational(utc_offset(), 86400)
     DateTime.new!(DateTime.__send__(:jd_to_ajd, jd, fr, of),
 		  of, DateTime::ITALY)
@@ -1830,8 +1833,11 @@ class Date
   def self.now(sg=ITALY)
     t = Time.now
     jd = civil_to_jd(t.year(), t.mon(), t.mday(), sg)
-    fr = time_to_day_fraction(t.hour(), t.min(), [t.sec(), 59].min()) +
+    fr = time_to_day_fraction(t.hour(), t.min(), [t.sec(), 59].min()) 
+if !defined?(RHO_WP7)    
+    +
       Rational(t.subsec, 86400)
+end      
     of = Rational(t.utc_offset(), 86400)
     new!(jd_to_ajd(jd, fr, of), of, sg)
   end

data/lib/framework/rho/rho.rb

@@ -1254,6 +1254,12 @@ module SyncEngine
         Object.const_get(src_name).on_sync_create_error(objects, action)
     end
 
+    def self.push_changes( src_name )
+        raise ArgumentError, 'push_changes src_name should be string' unless src_name.is_a?(String)
+        
+        Object.const_get(src_name).push_changes()
+    end
+
     def self.on_sync_update_error( src_name, objects, action, rollback_data = nil )
         raise ArgumentError, 'on_sync_update_error src_name should be string' unless src_name.is_a?(String)
     

data/lib/framework/rhom/rhom_object_factory.rb

@@ -1246,6 +1246,14 @@ module Rhom
                         raise    
                     end                        
                 end
+
+                def push_changes()
+                    return  unless is_sync_source()
+                    nSrcID = get_source_id()
+                    db = ::Rho::RHO.get_src_db(get_source_name)                            
+                
+                    db.insert_into_table('changed_values', {'update_type'=>'push_changes', 'source_id' => nSrcID } )
+                end
                 
                 def on_sync_create_error( objects, action )
                     raise ArgumentError, 'on_sync_create_error action should be :delete or :recreate' unless action == :delete || action == :recreate

data/lib/framework/rhomotoapi.rb

@@ -24,8 +24,8 @@
 # http://rhomobile.com
 #------------------------------------------------------------------------
 
-#TODO: enable it for Android also
-if System.get_property('platform') == 'WINDOWS'
+if Object.const_defined?('RhoElementsExt')
+
 module Barcode
 
 class << self
@@ -107,4 +107,5 @@ class << self
     end
 end    
 end
+
 end

data/platform/android/Rhodes/jni/include/rhodes/JNIRhodes.h

@@ -48,7 +48,8 @@ JavaVM *jvm();
 void store_thr_jnienv(JNIEnv *env);
 
 extern "C" {
-  void android_set_path(const rho::String& root, const rho::String& sqlite);
+  void android_set_path(const rho::String& root, const rho::String& sqlite, const rho::String& shared);
+  void android_set_log_path(const rho::String& path);
   void android_setup(JNIEnv *env);
 }
 
@@ -90,6 +91,13 @@ public:
     void clear() {}
 };
 
+class AndroidMemoryInfoCollector : public IMemoryInfoCollector
+{
+public:
+    virtual String collect();
+};
+
+
 
 } // namespace common
 } // namespace rho

data/platform/android/Rhodes/jni/include/rhodes/details/rhojava.inc

@@ -41,3 +41,4 @@ RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_SSLIMPL, "com/rhomobile/rhodes/socket
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_STRING, "java/lang/String")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_VECTOR, "java/util/Vector")
 RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_WEB_VIEW, "com/rhomobile/rhodes/WebView")
+RHODES_DEFINE_JAVA_CLASS(RHODES_JAVA_CLASS_MEMORY_INFO_COLLECTOR, "com/rhomobile/rhodes/MemoryInfoCollector")

data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_file_RhoFileApi.h

@@ -12,10 +12,18 @@ extern "C" {
 /*
  * Class:     com_rhomobile_rhodes_file_RhoFileApi
  * Method:    nativeInitPath
- * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+ * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
  */
 JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_file_RhoFileApi_nativeInitPath
-  (JNIEnv *, jclass, jstring, jstring, jstring);
+  (JNIEnv *, jclass, jstring, jstring, jstring, jstring);
+
+/*
+ * Class:     com_rhomobile_rhodes_file_RhoFileApi
+ * Method:    nativeInitLogPath
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_file_RhoFileApi_nativeInitLogPath
+  (JNIEnv *, jclass, jstring);
 
 /*
  * Class:     com_rhomobile_rhodes_file_RhoFileApi
@@ -65,6 +73,22 @@ JNIEXPORT jboolean JNICALL Java_com_rhomobile_rhodes_file_RhoFileApi_needEmulate
 JNIEXPORT jstring JNICALL Java_com_rhomobile_rhodes_file_RhoFileApi_makeRelativePath
   (JNIEnv *, jclass, jstring);
 
+/*
+ * Class:     com_rhomobile_rhodes_file_RhoFileApi
+ * Method:    setFsModeTransparrent
+ * Signature: (Z)V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_file_RhoFileApi_setFsModeTransparrent
+  (JNIEnv *, jclass, jboolean);
+
+/*
+ * Class:     com_rhomobile_rhodes_file_RhoFileApi
+ * Method:    removeBundleUpgrade
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_com_rhomobile_rhodes_file_RhoFileApi_removeBundleUpgrade
+  (JNIEnv *, jclass);
+
 #ifdef __cplusplus
 }
 #endif

data/platform/android/Rhodes/jni/src/callbacks.cpp

@@ -283,8 +283,3 @@ RHO_GLOBAL void rho_sys_set_application_icon_badge(int badge_number) {
     //unsupported on Android
 }
 
-RHO_GLOBAL void rho_sys_impl_before_exit()
-{
-    rho_file_set_fs_mode(RHO_FS_DISK_ONLY);
-}
-

data/platform/android/Rhodes/jni/src/camera.cpp

@@ -68,7 +68,7 @@ RHO_GLOBAL void take_picture(char* callback_url, rho_param *options_hash )
 
 }
 
-RHO_GLOBAL void choose_picture(char* callback_url)
+RHO_GLOBAL void choose_picture(char* callback_url, rho_param *options_hash)
 {
     JNIEnv *env = jnienv();
     jclass cls = getJNIClass(RHODES_JAVA_CLASS_CAMERA);

data/platform/android/Rhodes/jni/src/fileapi.cpp

@@ -120,6 +120,10 @@ static jmethodID midGetChildren;
 typedef FILE *(*func_sfp_t)();
 typedef int (*func_sflags_t)(const char *mode, int *optr);
 
+#ifndef DEFFILEMODE
+#define DEFFILEMODE  (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
+#endif
+
 static func_sflags_t __sflags;
 static func_sfp_t __sfp;
 
@@ -255,12 +259,18 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_file_RhoFileApi_updateStatTabl
 }
 
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_file_RhoFileApi_nativeInitPath
-  (JNIEnv *env, jclass, jstring root_path, jstring sqlite_journals_path, jstring apk_path)
+  (JNIEnv *env, jclass, jstring root_path, jstring sqlite_journals_path, jstring apk_path, jstring shared_path)
 {
-    android_set_path(rho_cast<std::string>(env, root_path), rho_cast<std::string>(env, sqlite_journals_path));
+    android_set_path(rho_cast<std::string>(env, root_path), rho_cast<std::string>(env, sqlite_journals_path), rho_cast<std::string>(env, shared_path));
     g_apk_path = (apk_path != NULL) ? rho_cast<std::string>(env, apk_path) : std::string();
 }
 
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_file_RhoFileApi_nativeInitLogPath
+  (JNIEnv *env, jclass, jstring path)
+{
+    android_set_log_path(rho_cast<std::string>(env, path));
+}
+
 RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_file_RhoFileApi_nativeInit
   (JNIEnv *env, jclass)
 {
@@ -339,11 +349,25 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_file_RhoFileApi_nativeInit
     librhodes_st.st_uid = getuid();
     librhodes_st.st_gid = getgid();
 
-    rho_file_set_fs_mode(RHO_FS_TRANSPARRENT);
-
     RHO_LOG("Library stat (mode: %d, uid: %d, gid: %d)", librhodes_st.st_mode, librhodes_st.st_uid, librhodes_st.st_gid);
 }
 
+
+extern "C" void rho_sysimpl_remove_bundle_files(const char* rootPath, const char* listFileName);
+
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_file_RhoFileApi_removeBundleUpgrade
+  (JNIEnv *env, jclass)
+{
+    rho_sysimpl_remove_bundle_files((rho_root_path() + "apps").c_str(), "rhofilelist.txt");
+}
+
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_file_RhoFileApi_setFsModeTransparrent
+  (JNIEnv *env, jclass , jboolean transparrent)
+{
+    rho_file_set_fs_mode(transparrent ? RHO_FS_TRANSPARRENT : RHO_FS_DISK_ONLY);
+}
+
+
 static std::string normalize_path(std::string path)
 {
     //RHO_LOG("normalize_path: (1): path: %s", path.c_str());
@@ -522,15 +546,6 @@ static bool need_emulate(std::string const &path)
             }
 
         }
-        else if (S_ISREG(st.st_mode))
-        {
-            rho_stat_t *rst = rho_stat(fpath);
-            if (rst && rst->mtime > st.st_mtime)
-            {
-                real_unlink(fpath.c_str());
-                return true;
-            }
-        }
     }
 
     return false;
@@ -1296,20 +1311,21 @@ static int __sclose(void *cookie)
 
 RHO_GLOBAL FILE *fopen(const char *path, const char *mode)
 {
+    int flags, oflags;
+    FILE *fp = 0;
+
     RHO_LOG("fopen: %s (%s)", path, mode);
 
-    int flags, oflags;
     if ((flags = __sflags(mode, &oflags)) == 0)
         return NULL;
+    if((fp = __sfp()) == 0)
+        return NULL;
 
-    int fd = open(path, oflags, S_IRWXU);
+    int fd = open(path, oflags, DEFFILEMODE);
     RHO_LOG("fopen: %s (%s): fd: %d", path, mode, fd);
-    if (fd == -1)
+    if (fd < 0)
         return NULL;
 
-    FILE *fp = __sfp();
-    if (!fp)
-        return NULL;
 
     fp->_flags = flags;
     fp->_file = fd;
@@ -1319,6 +1335,10 @@ RHO_GLOBAL FILE *fopen(const char *path, const char *mode)
     fp->_seek = __sseek;
     fp->_close = __sclose;
 
+    // Do seek at our level as well even though oflags passed to open
+    if (oflags & O_APPEND)
+        (void) __sseek((void *)fp, (fpos_t)0, SEEK_END);
+
     RHO_LOG("fopen: %s (%s): fp: %p", path, mode, fp);
     return fp;
 }