rhodes 3.3.3.beta.4 → 3.3.3

data/doc/synchronization.txt

@@ -144,8 +144,19 @@ These parameters are included in all notifications.
 * `@params["cumulative_count"]` - Number of records the `SyncEngine` has processed so far for this source.
 
 #### "in_progress" - bulk sync
-* `@params["bulk_status"]` - The state of the bulk sync process: "start", "download", "change_db".
-
+* `@params["bulk_status"]` - The state of the bulk sync process: 
+
+ "start": when bulk sync start and when specific partition is start syncing
+ 
+ "download": when client start downloading database from server
+ 
+ "change_db": when client start applying new database
+ 
+ "ok": when sync of partition finished without error
+ 
+ "complete": when bulk sync finished for all partitions without errors
+ 
+* `@params["partition"]` - Current bulk sync partition.
 
 #### "error"
 * `@params["error_code"]` - HTTP response code of the RhoConnect server error: 401, 500, 404, etc.
@@ -677,4 +688,11 @@ For example:
 
 Parameters are the same as for ModelName.search with an additional parameter:
 
-* `:source_names` - Sends a list of source adapter names to RhoConnect to search across.
+* `:source_names` - Sends a list of source adapter names to RhoConnect to search across.
+
+## SyncEngine AJAX API
+[Sync engine AJAX API](syncengine-ajax-api) has been implemented to provide access to low-level control on
+synchronization process right from plain HTML/javascript UI pages.
+
+It isn't intended to be used in every application. It requires deep knowledge of SyncEngine functionality and operations.
+It may broke your application if used improperly so use it with care please.

data/doc/test-log-debug.txt

@@ -94,6 +94,8 @@ Call the RhoLog error or info methods from a method in your Rhodes app:
 		RhoLog.error("Some Category", "Some message")
 	end
 
+Additionally all common ruby output routines (like puts, print) are redirected to rhodes log with INFO level.
+
 In rholog.txt the lines appear as follows:
 
 	<Timestamp> <category> | <message>
@@ -128,6 +130,6 @@ See [Login/Logout Manager]() as an example.
 
 ## Debugging
 
-You can use the [RhoStudio debugger](rhostudio.tutorial#using-the-debugger) to debug your Rhodes app. 
+You can use the [RhoStudio debugger](/rhostudio.tutorial#using-the-debugger) to debug your Rhodes app. 
 
 

data/doc/ui.txt

@@ -184,11 +184,11 @@ You can control how image presented by modifying splash_screen options in [rhoco
 
 Examples:
 
-Place splash screen in the center and show it for 5 seconds: 
+Place the splash screen in the center and show it for 5 seconds: 
 	:::ruby
 	splash_screen='delay=5;center'
 
-Center splash screen horizontally, scale it vertically to file all available space, and show it for 5 seconds: 
+Center the splash screen horizontally, scale it vertically to file all available space, and show it for 5 seconds: 
 	:::ruby
 	splash_screen='delay=5;hcenter;vzoom'
 
@@ -199,7 +199,7 @@ You can customize you loading image (showed on start of application) for each pl
 * WM `loading.wm.png`
 * BB `loading.bb.png`
 
-If application doesn't have platform specific `loading.png`, then Rhodes'll try to load default `loading.png`.
+If application doesn't have platform specific `loading.png`, then Rhodes will try to load default `loading.png`.
 
 For iPhone you may define a set of loading images. See Apple documentation about these images, [section Application Launch Images in Build-Time Configuration Details](http://developer.apple.com/library/ios/#documentation/iPhone/Conceptual/iPhoneOSProgrammingGuide/BuildTimeConfiguration/BuildTimeConfiguration.html).
 
@@ -263,15 +263,15 @@ Force WebView refresh current page on tab with specified index. If no tab bar pr
 	:::ruby
 	WebView.refresh(index) 
 
-Force WebView navigate to provided location (url)
+Force WebView to navigate to provided location (url)
 	:::ruby
 	WebView.navigate(url) 
 	
-Since 1.2.2 WebView.navigate supports an optional index parameter (defaults to 0, useful for tabbed applications)
+WebView.navigate supports an optional index parameter (defaults to 0, useful for tabbed applications)
 	:::ruby
 	WebView.navigate(url, index)
 
-Force WebView navigate to previouse page using Browser back
+Force WebView to navigate to previous page using Browser back
 	:::ruby
 	WebView.navigate_back
 
@@ -279,12 +279,12 @@ Get location (url) of the currently displayed page
 	:::ruby
 	WebView.current_location 
 
-The same as above but for specified tab (if tab bar present)	
+The same as above, but for specified tab (if tab bar is present)	
 	:::ruby
 	WebView.current_location(index) 
 
 Execute javascript string in the context of the currently displayed page. Supported on iPhone, Android, Windows Mobile and Blackberry 5.0 in full browser mode.
-Suppose that current page has js method:
+Suppose that current page has the Javascript method:
 	:::html
 	function test() {
 	    alert("Test");
@@ -300,7 +300,7 @@ The same as above but for specified tab (if tab bar present)
 	WebView.execute_js("test();", index) 
 
 
-Returns index of @tabs array for currently selected tab
+Returns index of @tabs array for the currently selected tab
 	:::ruby
 	WebView.active_tab 
 
@@ -308,7 +308,7 @@ Switch to/from full screen mode
 	:::ruby
 	WebView.full_screen_mode(enable)
 
-Set cookie to be used by WebView for specified url. Each time when WebView load specified url (either by selecting link or in result of calling WebView.navigate), it will add this cookie to the HTTP request. Cookie should be in format "NAME=VALUE". Multiple name/value pairs allowed. In this case they need to be split by semicolon: "NAME1=VALUE1; NAME2=VALUE2".
+Set cookie is to be used by WebView to load a specified url. Each time WebView loads specified url (either by selecting link or as a result of calling WebView.navigate), it will add this cookie to the HTTP request. The cookie should be in format "NAME=VALUE, with multiple name/value pairs allowed. If more than one is set, they need to be split by semicolon: "NAME1=VALUE1; NAME2=VALUE2".
 	:::ruby
 	WebView.set_cookie(url, cookie)
 
@@ -316,7 +316,7 @@ Set cookie to be used by WebView for specified url. Each time when WebView load
 See controller and view in the /app/Image folder of the [system API sample application](http://github.com/rhomobile/rhodes-system-api-samples/tree/master/app/Image/controller.rb#L30) for some of the examples of how to use WebView in the callbacks.
 
 ## Application Menu
-For platforms which support menus Rhodes framework provides ability to change the native application menu items through the following simple API:
+For platforms which support menus, Rhodes framework provides the ability to change the native application menu items through the following simple API:
 
 	:::ruby
 	@default_menu = { 
@@ -418,7 +418,7 @@ Action can be also URL of user-defined controller method. URL can be prefixed wi
 
 Some examples:
 
-Calling of this action will be done by UI WebView component so result of the do_that method will be rendered in UI
+Calling of this action will be done by UI WebView component so the result of the do_that method will be rendered in UI
 	:::ruby
 	:action => url_for(:action => :do_that) 
 
@@ -436,14 +436,14 @@ The same as above but for another controller
 	
 ## Redefine back action
 
-Use :back parameter in render:
+Use the :back parameter in render:
 
 	:::ruby
 	render :action => :index, :back => 
 		url_for( :controller => :Settings, :action => :main_page )
 	render :back => '/app'
 
-Use back with callback:
+Use :back with callback:
 
 	:::ruby
 	render :action => :page_alert, :back => 
@@ -588,7 +588,7 @@ For the tabbar:
 	:::ruby
 	class AppApplication < Rho::RhoApplication
 	  def initialize
-	    # Tab items are loaded left->right, @tabs[0] is leftmost tab in the tab-bar
+	    # Tab items are loaded left->right, @tabs[0] is the leftmost tab in the tab-bar
 	    @tabs = [
 	      { :label => "Dashboard", :action => '/app', 
 			:icon => "/public/images/tabs/dashboard.png", :reload => true, :web_bkg_color => 0x7F7F7F }, 
@@ -636,7 +636,7 @@ Each tabbar item defined in the above sample defines the following tab elements:
 * :reload => true - (optional) tells rhodes to reload the tab's :action, default is false
 * :selected_color => 0xFFFF00 - (optional) change selected color of this tab (if you use it on Android, you should define it for all tabs, and also define :background_color for TabBar)
 * :disabled => true - (optional) disable this tab
-* :web_bkg_color = > int hex value (0x7F7F7F for example) - background color for the tab (use when your app bkg is not white to remove blink when switching tabs)
+* :web_bkg_color = > hex value (0x7F7F7F for example) - background color for the tab (use when your app background is not white to remove the blink while switching tabs)
 * :use_current_view_for_tab => true - (optional) tells rhodes to smooth transfer WebView from current view into this Tab and make this Tab active. Defaults to false. Only one Tab can have this parameter.
 
 

data/ext/extconf.rb

@@ -9,6 +9,14 @@ cp File.dirname(__FILE__) +"/../rhobuild.yml.example", File.dirname(__FILE__) +"
 #Only because iphone sim doesn work if you run it with sudo
 chmod_R 0777, File.dirname(__FILE__) + "/.."
 
+File.chmod 0755, File.dirname(__FILE__) + "/../bin/get-rhodes-info"
+File.chmod 0755, File.dirname(__FILE__) + "/../bin/migrate-rhodes-app"
+File.chmod 0755, File.dirname(__FILE__) + "/../bin/rhodes"
+File.chmod 0755, File.dirname(__FILE__) + "/../bin/rhodes-setup"
+File.chmod 0755, File.dirname(__FILE__) + "/../bin/rhogen"
+File.chmod 0755, File.dirname(__FILE__) + "/../bin/set-rhodes-sdk"
+File.chmod 0755, File.dirname(__FILE__) + "/../bin/upgrade-rhodes-app"
+
 #This is the hack, we make all the things to make it look like an extension has compiled
 
     File.open('Makefile', 'w') { |f| f.write "all:\n\ninstall:\n\n" }

data/lib/build/jake.rb

@@ -172,9 +172,9 @@ class Jake
     reset_spec_server(platform) if appname =~ /phone_spec/
 
     rhobuildyml = File.join(basedir,'rhobuild.yml')
-    rhobuild = YAML::load_file(rhobuildyml)
-    rhobuild['env']['app'] = app_expanded_path(appname)
-    File.open(rhobuildyml,'w') {|f| f.write rhobuild.to_yaml}
+    #rhobuild = YAML::load_file(rhobuildyml)
+    #rhobuild['env']['app'] = app_expanded_path(appname)
+    #File.open(rhobuildyml,'w') {|f| f.write rhobuild.to_yaml}
     $app_path = File.expand_path(File.join(basedir,'spec',appname))
     $app_config = Jake.config(File.open(File.join($app_path, "build.yml")))
     $config = Jake.config(File.open(rhobuildyml,'r'))
@@ -497,7 +497,7 @@ class Jake
     old_content = File.exists?(file_name) ? File.read(file_name) : ""
 
     if old_content != content  
-        puts "Modify #{file_name}"      
+        puts "!!!MODIFY #{file_name}"      
         File.open(file_name, "w"){|file| file.write(content)}
     end
     
@@ -609,7 +609,7 @@ class Jake
         puts "EXC: #{e}"
     end    
   
-    system("START rake run:webrickrhologserver[#{app_path}]")
+    system("START rake run:webrickrhologserver[\"#{app_path}\"]")
   end
     
 end

data/lib/extensions/barcode/ext/barcode/platform/android/Rakefile

@@ -14,20 +14,20 @@ def build_extension(name, arch, src_files)
   #Dir.glob("*.c").each do |f|
   src_files.each do |f|
     objname = File.join( $tempdir, File.basename( f.gsub(/\.c$/, '.o') ) )
-    objects << objname
+    objects << ('"'+objname+'"')
 
     args = []
     args << "-I."
-    args << "-I#{$rootdir}/platform/shared/ruby/include"
-    args << "-I#{$rootdir}/platform/shared"
+    args << "-I\"#{$rootdir}/platform/shared/ruby/include\""
+    args << "-I\"#{$rootdir}/platform/shared\""
 
-    args << "-I#{$std_includes}" unless $std_includes.nil?
+    args << "-I\"#{$std_includes}\"" unless $std_includes.nil?
     args << "-D__NEW__" if use_own_stlport
-    args << "-I#{$stlport_includes}" if use_own_stlport
+    args << "-I\"#{$stlport_includes}\"" if use_own_stlport
     
-    args << "-I#{$rootdir}/platform/shared/ruby/android"
-    args << "-I#{$rootdir}/platform/shared/ruby/generated"
-    args << "-I#{$rootdir}/platform/android/Rhodes/jni/include"
+    args << "-I\"#{$rootdir}/platform/shared/ruby/android\""
+    args << "-I\"#{$rootdir}/platform/shared/ruby/generated\""
+    args << "-I\"#{$rootdir}/platform/android/Rhodes/jni/include\""
 
     cc_compile f, $tempdir, args or exit 1
 
@@ -35,7 +35,7 @@ def build_extension(name, arch, src_files)
 
   mkdir_p $targetdir unless File.exist? $targetdir
 
-  cc_ar File.join( $targetdir, 'lib' + name + '.a' ), Dir.glob($tempdir + "/**/*.o") or exit 1
+  cc_ar ('"'+File.join( $targetdir, 'lib' + name + '.a' )+'"'), Dir.glob($tempdir + "/**/*.o").collect{|x| '"'+x+'"'} or exit 1
 
 end
 

data/lib/extensions/barcode/ext/barcode/platform/android/jni/src/barcode.cpp

@@ -1,6 +1,6 @@
 //#include "rhodes/JNIRhodes.h"
 #include <rhodes.h>
-//#include <android/log.h>
+#include <android/log.h>
 #include <common/RhodesApp.h>
 #include <logging/RhoLog.h>
 #include <stdlib.h>
@@ -85,3 +85,83 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_barcode_Barcode_callback
     rho_net_request_with_data(url, rho_cast<std::string>(env, body).c_str());
     rho_http_free(url);
 }
+
+
+
+class RhoScannersListContainer : public rho::ICallbackObject
+{
+public:
+	RhoScannersListContainer() {
+	}
+    
+	virtual ~RhoScannersListContainer() {
+	}
+    
+	virtual unsigned long getObjectValue() {
+        VALUE b_array = rho_ruby_create_array();
+        VALUE b_hash = rho_ruby_createHash();
+        rho_ruby_add_to_hash(b_hash, rho_ruby_create_string("friendlyName"), rho_ruby_create_string("RhoBarcode based on ZXing"));
+        rho_ruby_add_to_hash(b_hash, rho_ruby_create_string("deviceName"), rho_ruby_create_string("RhoBarcode"));
+        rho_ruby_add_to_array(b_array, b_hash);
+        return b_array;
+	}
+};
+
+
+
+
+
+RHO_GLOBAL void JNICALL Java_com_rhomobile_barcode_Barcode_enumeratecallback
+(JNIEnv *env, jclass, jstring callback_url) {
+    char* url = rho_http_normalizeurl(rho_cast<std::string>(env, callback_url).c_str());
+    
+    char body[2048];
+    
+	strcpy(body, "&status=ok&rho_callback=1&");
+	strcat(body, (RHODESAPP().addCallbackObject( new RhoScannersListContainer(), "scannerArray")).c_str());
+    char* norm_url = rho_http_normalizeurl(url);
+    
+    rho_net_request_with_data(norm_url, body);
+    rho_http_free(norm_url);    
+    
+    
+    
+}
+
+extern "C" void rho_motobarcode_enumerate(const char* callback) {
+    
+    JNIEnv *env = jnienv();
+    jclass cls = rho_find_class(env, "com/rhomobile/barcode/Barcode");
+    if (!cls) return;
+    jmethodID mid = env->GetStaticMethodID( cls, "callMotoEnumerateCallback", "(Ljava/lang/String;)V");
+    if (!mid) return;
+    
+    jstring objCallback = env->NewStringUTF(callback);
+    if(objCallback != NULL)
+    {
+        env->CallStaticObjectMethod(cls, mid, objCallback);
+        env->DeleteLocalRef(objCallback);
+    }
+
+    //VALUE b_array = rho_ruby_create_array();
+    //rho_ruby_add_to_array(b_array, rho_ruby_create_string("RhoBarcode based on ZXing"));
+	//return b_array;
+   
+}
+
+extern "C" void  rho_motobarcode_enable(const char* callback, rho_param* p) {
+    __android_log_write(ANDROID_LOG_INFO, "RhoBarcode", "Barcode::enable() DO NOT SUPPORT BY RHODES SW SCANNER !");    
+}
+
+extern "C" void  rho_motobarcode_disable() {
+    __android_log_write(ANDROID_LOG_INFO, "RhoBarcode", "Barcode::disable() DO NOT SUPPORT BY RHODES SW SCANNER !");    
+}
+
+extern "C" void  rho_motobarcode_start() {
+    __android_log_write(ANDROID_LOG_INFO, "RhoBarcode", "Barcode::start() DO NOT SUPPORT BY RHODES SW SCANNER !");    
+}
+
+extern "C" void  rho_motobarcode_stop() {
+    __android_log_write(ANDROID_LOG_INFO, "RhoBarcode", "Barcode::stop() DO NOT SUPPORT BY RHODES SW SCANNER !");    
+}
+

data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/CaptureActivityHandler.java

@@ -67,44 +67,37 @@ public final class CaptureActivityHandler extends Handler {
 
   @Override
   public void handleMessage(Message message) {
-    switch (message.what) {
-      case R.id.auto_focus:
+    if (message.what == R.id.auto_focus) {
         //Log.d(TAG, "Got auto-focus message");
         // When one auto focus pass finishes, start another. This is the closest thing to
         // continuous AF. It does seem to hunt a bit, but I'm not sure what else to do.
         if (state == State.PREVIEW) {
           CameraManager.get().requestAutoFocus(this, R.id.auto_focus);
         }
-        break;
-      case R.id.restart_preview:
+    } else if (message.what == R.id.restart_preview) {
         Log.d(TAG, "Got restart preview message");
         restartPreviewAndDecode();
-        break;
-      case R.id.decode_succeeded:
+    } else if (message.what == R.id.decode_succeeded) {
         Log.d(TAG, "Got decode succeeded message");
         state = State.SUCCESS;
         Bundle bundle = message.getData();
         Bitmap barcode = bundle == null ? null :
             (Bitmap) bundle.getParcelable(DecodeThread.BARCODE_BITMAP);
         activity.handleDecode((Result) message.obj, barcode);
-        break;
-      case R.id.decode_failed:
+    } else if (message.what == R.id.decode_failed) {
         // We're decoding as fast as possible, so when one decode fails, start another.
         state = State.PREVIEW;
         CameraManager.get().requestPreviewFrame(decodeThread.getHandler(), R.id.decode);
-        break;
-      case R.id.return_scan_result:
+    } else if (message.what == R.id.return_scan_result) {
         Log.d(TAG, "Got return scan result message");
         activity.setResult(Activity.RESULT_OK, (Intent) message.obj);
         activity.finish();
-        break;
-      case R.id.launch_product_query:
+    } else if (message.what == R.id.launch_product_query) {
         Log.d(TAG, "Got product query message");
         String url = (String) message.obj;
         Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
         activity.startActivity(intent);
-        break;
     }
   }
 

data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/DecodeHandler.java

@@ -49,14 +49,10 @@ final class DecodeHandler extends Handler {
 
   @Override
   public void handleMessage(Message message) {
-    switch (message.what) {
-      case R.id.decode:
-        //Log.d(TAG, "Got decode message");
+    if (message.what == R.id.decode) {
         decode((byte[]) message.obj, message.arg1, message.arg2);
-        break;
-      case R.id.quit:
+    } else if (message.what == R.id.quit) {
         Looper.myLooper().quit();
-        break;
     }
   }
 

data/lib/extensions/barcode/ext/barcode/platform/android/src/com/rhomobile/barcode/Barcode.java

@@ -79,7 +79,18 @@ public class Barcode {
      }
      
    	 public static native void callback(String callbackUrl, String body);
-     
+
+   	 public static native void enumeratecallback(String callback_url);
+   	 
+   	 public static void callMotoEnumerateCallback(String callbackUrl) {
+   		 final String cb = callbackUrl;
+   		 PerformOnUiThread.exec(new Runnable() {
+   			public void run() {
+   				enumeratecallback(cb);
+   			}
+   		 });
+   	 }
+   	 
      public static void callCancelCallback() {
  		StringBuffer body = new StringBuffer();
 		body.append("&rho_callback=1");

data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/BarcodeCallbackHelper.h

@@ -19,6 +19,8 @@ void Barcode_executeRhoCallBackWithParams(NSString* callbackURL,
     NSString* str3Name, NSString* str3Value,
     NSString* dataName, NSData* dataValue
 );
+    
+void Barcode_executeEnumerateCallback(NSString* url);    
 
 #ifdef __cplusplus
 }