RubyGems - rhodes - Versions diffs - 3.3.3.beta.3 → 3.3.3.beta.4 - Mend

rhodes 3.3.3.beta.3 → 3.3.3.beta.4

Files changed (133) hide show

data/doc/rhom.txt CHANGED Viewed

@@ -586,10 +586,10 @@ For such models if you try to add not listed property - you will get ArgumentErr
     obj = Customer.new( :wrong_address => 'test') #will raise ArgumentError exception
     obj = Customer.create( :wrong_address => 'test') #will raise ArgumentError exception
-    obj = getCase().new
+    obj = Customer.new
     obj.wrong_address = 'test' #will raise ArgumentError exception
-    obj = getCase().new
+    obj = Customer.new
     obj.update_attributes(:wrong_address => 'test') #will raise ArgumentError exception

data/doc/test-log-debug.txt CHANGED Viewed

@@ -98,6 +98,12 @@ In rholog.txt the lines appear as follows:
 	<Timestamp> <category> | <message>
+To enable remote logging just add the line to `rhoconfig.txt`:
+	rhologurl = 'http://<host>:<port>[/path]'
+Then all log messages will be sent to the specified URL via POST HTTP-requests.
 ### RhoError class
 You may find access to the error class useful in logging and reporting:

data/doc/ui.txt CHANGED Viewed

@@ -162,6 +162,14 @@ In case of problems with pages transition performance just uncomment appropriate
 You may find it at very end of *mobileinit* handler function.
+#### jQueryMobile CSS issues on Windows Phone 7.0
+In case you have jQueryMobile rendering broken on Windows Phone 7.0 you need to add this tag inside of *<head>* tag in *layout.erb* file:
+    :::html
+    <meta http-equiv="X-UA-Compatible" content="IE=9"/>
+It should fix jQueryMobile rendering problems on Windows Phone 7.0 platform.
 ## Loading screen
 Rhodes supports the display of a custom "Loading" screen while your application is launching. This screen's source is the file loading.html, located at <application-root>/app/loading.html.
@@ -400,6 +408,11 @@ Here is list of allowed values for actions for user defined menus, toolbars and
 * :separator - draw a separator line (if supported)
 * :close - close or put Rhodes to background (depending on platform)
 * :fullscreen - go to full screen mode
+* :copy_paste - enable copy\paste functionality (Blackberry only). System menu items are displayed:
+	    @default_menu = {
+	      "Copy_Paste" => :copy_paste,
+        }
 Action can be also URL of user-defined controller method. URL can be prefixed with 'callback:' meaning it should be loaded by rhodes core, not WebView. This will effectively load specified url but in background, not touching UI.

data/lib/build/jake.rb CHANGED Viewed

@@ -527,7 +527,7 @@ class Jake
   end
   def self.zip_upgrade_bundle(folder_path, zip_file_path)
       File.delete(zip_file_path) if File.exists?(zip_file_path)
       currentdir = Dir.pwd()
@@ -545,7 +545,7 @@ class Jake
           Zip::ZipFile.open(zip_file_path, Zip::ZipFile::CREATE)do |zipfile|
             Find.find("RhoBundle") do |path|
               Find.prune if File.basename(path)[0] == ?.
-              next if path.start_with?("RhoBundle/lib") || path.start_with?("RhoBundle/db")
+              next if path.start_with?("RhoBundle/lib") || path.start_with?("RhoBundle/db") || path == 'RhoBundle/hash' || path == 'RhoBundle/name'
               puts "add to zip : #{path}"
               zipfile.add(path, path)
@@ -559,16 +559,17 @@ class Jake
       else
         #chdir folder_path
         temp_dir = folder_path + '_tmp'
-        cp_r folder_path, temp_dir
+        mkdir_p temp_dir
+        cp_r 'RhoBundle', temp_dir
         chdir temp_dir
-        rm_rf File.join(temp_dir, 'RhoBundle/lib')
-        rm_rf File.join(temp_dir, 'RhoBundle/db')
-        rm_rf File.join(temp_dir, 'RhoBundle/hash')
-        rm_rf File.join(temp_dir, 'RhoBundle/name')
+        rm_rf File.join(temp_dir, 'RhoBundle/lib')
+        rm_rf File.join(temp_dir, 'RhoBundle/db')
+        rm_rf File.join(temp_dir, 'RhoBundle/hash')
+        rm_rf File.join(temp_dir, 'RhoBundle/name')
         sh %{zip -r temporary_archive.zip .}
         cp_r 'temporary_archive.zip', zip_file_path
-        rm_rf 'temporary_archive.zip'
-        rm_rf temp_dir
+        rm_rf 'temporary_archive.zip'
+        rm_rf temp_dir
       end
       Dir.chdir currentdir
@@ -578,8 +579,7 @@ class Jake
   def self.run_rho_log_server(app_path)
 	confpath_content = File.read($srcdir + "/apps/rhoconfig.txt") if File.exists?($srcdir + "/apps/rhoconfig.txt")
-	confpath_content += "\r\n" + "rhologhost=" + $rhologhostaddr
-	confpath_content += "\r\n" + "rhologport=" + $rhologhostport.to_s()
+	confpath_content += "\r\n" + "rhologurl=http://" + $rhologhostaddr + ":" + $rhologhostport.to_s() if !confpath_content.include?("rhologurl=")
 	File.open($srcdir + "/apps/rhoconfig.txt", "w") { |f| f.write(confpath_content) }  if confpath_content && confpath_content.length()>0
     begin

data/lib/extensions/crypt/crypt/cbc.rb CHANGED Viewed

@@ -2,9 +2,12 @@
 module Crypt
 module CBC
   require 'crypt/stringio'
-  require 'crypt/stringxor'
+  if defined?( RHO_WP7 )
+    require 'stringio'
+  end
+  require 'crypt/stringxor'
   ULONG = 0x100000000

data/lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/Nfc.java CHANGED Viewed

@@ -193,15 +193,17 @@ public class Nfc implements RhodesActivityListener {
 		log(" $$$$$$$$$ setEnable() FINISH() ");
 	}
+	@Override
 	public void onCreate(RhodesActivity activity, Intent intent) {
 		getInstance().onNewIntent(activity, intent, true);
 	}
+	@Override
 	public void onRhodesActivityStartup(RhodesActivity activity) {
 		activity.addRhodesActivityListener(getInstance());
 	}
+	@Override
 	public void onPause(RhodesActivity activity) {
 		log(" $$$$$$$$$ onPause() ");
 		NfcAdapter nfcAdapter = getDefaultAdapter(RhodesActivity.getContext());
@@ -211,6 +213,7 @@ public class Nfc implements RhodesActivityListener {
 		}
 	}
+	@Override
 	public void onResume(RhodesActivity activity) {
 		log(" $$$$$$$$$ onResume() ");
 		NfcAdapter nfcAdapter = getDefaultAdapter(RhodesActivity.getContext());
@@ -230,6 +233,15 @@ public class Nfc implements RhodesActivityListener {
 		}
 	}
+	@Override
+	public void onStart(RhodesActivity activity) {}
+	@Override
+	public void onStop(RhodesActivity activity) {}
+	@Override
+	public void onDestroy(RhodesActivity activity) {}
 	public void onNewIntent(RhodesActivity activity, Intent intent, boolean postpone) {
 		String action = intent.getAction();
@@ -345,6 +357,7 @@ public class Nfc implements RhodesActivityListener {
         }
 	}
+    @Override
 	public void onNewIntent(RhodesActivity activity, Intent intent) {
 		if (activity.isInsideStartStop()) {
 			onNewIntent(activity, intent, false);
@@ -354,9 +367,6 @@ public class Nfc implements RhodesActivityListener {
 		}
 	}
 	public static void setCallback(String callback) {
 		ourCallback = callback;
 	}

data/lib/framework/rho/render.rb CHANGED Viewed

@@ -113,6 +113,14 @@ module Rho
         #puts "meta deleted"
     end
+    def __get_model
+        model = nil
+        begin
+            model = Object.const_get(@request['model'].to_sym()) if Object.const_defined?(@request['model'].to_sym() )
+        rescue Exception => exc
+        end
+    end
     def render(options = nil)
       if @params['rho_callback']
         rho_error( "render call in callback. Call WebView.navigate instead" )
@@ -128,12 +136,17 @@ module Rho
       action = options[:action] if options[:action]
       action = @request['action'].nil? ? default_action : @request['action'] unless action
-      if $".include?( "rhodes_translator") and @request['model'] != nil
-        model = nil
-        model = Object.const_get(@request['model'].to_sym) if Object.const_defined?(@request['model'].to_sym)
+      if @request['model'] != nil
+        model = __get_model()
         if model && model.respond_to?( :metadata ) and model.metadata != nil
+          if $".include?( "rhodes_translator")
             metaenabled = model.metadata[action.to_s] != nil
-        end
+          else
+            rho_error( "unable to load rhodes_translator gem." )
+          end
+        end
       end
       if not options[:string].nil?

data/lib/framework/rho/rho.rb CHANGED Viewed

@@ -1321,7 +1321,7 @@ module WebView
         alias_method :orig_execute_js, :execute_js
     end
-    def self.execute_js(func, index = 0, vals = nil)
+    def self.execute_js(func, index = -1, vals = nil)
         if (vals && 0 < vals.size)
             func += '('
             vals.each do |val|

data/lib/framework/rho/rhocontroller.rb CHANGED Viewed

@@ -61,7 +61,17 @@ module Rho
         hashObjs = params['__rho_object']
         hashObjs.each do |name,index|
-            params[name] = __rhoGetCallbackObject(index.to_i())
+            if name == '__rho_inline'
+                params.merge!( __rhoGetCallbackObject(index.to_i()) )
+                barcodeModule = Object.const_get('Barcode') if Object.const_defined?('Barcode')
+                if barcodeModule && barcodeModule.respond_to?( :rho_process_moto_callback )
+                    barcodeModule.rho_process_moto_callback(params)
+                end
+            else
+                params[name] = __rhoGetCallbackObject(index.to_i())
+            end
         end
         params.delete('__rho_object')

data/lib/framework/rhomotoapi.rb ADDED Viewed

@@ -0,0 +1,110 @@
+#------------------------------------------------------------------------
+# (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
+#------------------------------------------------------------------------
+#TODO: enable it for Android also
+if System.get_property('platform') == 'WINDOWS'
+module Barcode
+class << self
+    def take_barcode( callback, hashParams = {} )
+        enable(callback, hashParams)
+        RhoElementsExt.meta_proc('scanner', 'start', "")
+    end
+    def enable( callback = nil, hashParams = {} )
+        strParams = ""
+        scannerID = nil
+        hashParams.each do |key, value|
+            if key.to_s() == 'deviceName'
+                scannerID = value
+                next
+            end
+            strParams += "#{key}:#{value};"
+        end
+        strParams += "decodeEvent:url('#{callback}');" if callback
+        if scannerID
+            strParams += "enabled:#{scannerID};"
+        else
+            strParams += "enable;"
+        end
+        RhoElementsExt.meta_proc('scanner', strParams, "")
+    end
+    def enumerate(callback=nil)
+        if callback
+            RhoElementsExt.meta_proc('scanner', "EnumScannerEvent:url('#{callback}');enumerate", "")
+        else
+            RhoElementsExt.meta_proc('scanner', 'enumerate', '')
+        end
+    end
+	def disable
+		RhoElementsExt.meta_proc('scanner', 'disable', '')
+	end
+	def start
+		RhoElementsExt.meta_proc('scanner', 'start', '')
+	end
+	def stop
+		RhoElementsExt.meta_proc('scanner', 'stop', '')
+	end
+	def setEmml(argument)
+		RhoElementsExt.meta_proc('scanner', argument.to_s, '')
+	end
+    def method_missing(name, *args)
+      unless name == Fixnum
+        if name[name.length()-1] == '='
+          Scanner.send(name.to_s.chop().to_sym , args[0] ? args[0].to_s : "")
+        else
+          Scanner.send(name.to_sym)
+        end
+      end
+    end
+    def rho_process_moto_callback(params)
+        puts "rho_process_moto_callback : #{params}"
+        return unless params['event'] == 'Decode'
+        if params['data']
+            params['barcode'] = params['data']
+            params['status'] = 'ok'
+        else
+            params['status'] = 'cancel'
+        end
+    end
+end
+end
+end

data/platform/android/Rhodes/jni/Android.mk CHANGED Viewed

@@ -50,17 +50,14 @@ LOCAL_C_INCLUDES := \
 LOCAL_STATIC_LIBRARIES := \
 	ruby rhorubyext json rhomain rhocommon rhodb rhoconnect rhonet curl sqlite rholog \
-	rhocommon rhonet rhostat rhorubyext \
-	unzip
+	rhocommon rhonet rhostat rhorubyext unzip \
 #barcode nfc
 LOCAL_LDLIBS := -llog -ldl -lz
 include $(BUILD_SHARED_LIBRARY)
-#include $(LOCAL_PATH)/../../../../lib/extensions/barcode/ext/barcode/platform/android/jni/Android.mk
-NDK_MODULE_PATH := $(SHARED_PATH_INC)
 $(call import-module,sqlite)
 $(call import-module,curl)
 $(call import-module,ruby)

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

@@ -38,6 +38,7 @@
 #include <logging/RhoLog.h>
 #ifndef RHO_NO_RUBY
+//This include is required for rhojava.inc below
 #include <genconfig.h>
 #endif

data/platform/android/Rhodes/jni/include/rhodes/fileapi.h ADDED Viewed

@@ -0,0 +1,38 @@
+/*------------------------------------------------------------------------
+* (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
+*------------------------------------------------------------------------*/
+#ifndef FILEAPI_H_
+#define FILEAPI_H_
+#include "common/RhoDefs.h"
+#include "common/RhoStd.h"
+enum RhoFsMode {RHO_FS_DISK_ONLY = 0, RHO_FS_TRANSPARRENT};
+RHO_GLOBAL void rho_file_set_fs_mode(int mode);
+RHO_GLOBAL void rho_file_patch_stat_table(const rho::String& path);
+#endif /* FILEAPI_H_ */

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

@@ -28,6 +28,7 @@
 #include "rhodes/JNIRhoRuby.h"
 #include "rhodes/RhoClassFactory.h"
+#include "rhodes/fileapi.h"
 #include <ruby/ext/rho/rhoruby.h>
@@ -69,32 +70,6 @@ RHO_GLOBAL void rho_file_impl_delete_files_in_folder(const char *szFolderPath)
     env->CallStaticVoidMethod(cls, mid, objFolderPath.get());
 }
-RHO_GLOBAL void rho_file_impl_delete_folder(const char* szFolderPath) {
-    /*
-    JNIEnv *env = jnienv();
-    jclass cls = getJNIClass(RHODES_JAVA_CLASS_RHODES_SERVICE);
-    if (!cls) return;
-    jmethodID mid = getJNIClassStaticMethod(env, cls, "deleteFolder", "(Ljava/lang/String;)V");
-    if (!mid) return;
-    jhstring objFolderPath = rho_cast<jhstring>(szFolderPath);
-    env->CallStaticVoidMethod(cls, mid, objFolderPath.get());
-     */
-}
-RHO_GLOBAL void rho_file_impl_copy_folders_content_to_another_folder(const char* szSrcFolderPath, const char* szDstFolderPath) {
-    /*
-    JNIEnv *env = jnienv();
-    jclass cls = getJNIClass(RHODES_JAVA_CLASS_RHODES_SERVICE);
-    if (!cls) return;
-    jmethodID mid = getJNIClassStaticMethod(env, cls, "copyFoldersContentToAnotherFolder", "(Ljava/lang/String;Ljava/lang/String;)V");
-    if (!mid) return;
-    jhstring objSrcFolderPath = rho_cast<jhstring>(szSrcFolderPath);
-    jhstring objDstFolderPath = rho_cast<jhstring>(szDstFolderPath);
-    env->CallStaticVoidMethod(cls, mid, objSrcFolderPath.get(), objDstFolderPath.get());
-     */
-}
 RHO_GLOBAL void rho_platform_restart_application() {
 }
@@ -307,3 +282,9 @@ RHO_GLOBAL void rho_sys_app_uninstall(const char *appname)
 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);
+}