rhodes 3.3.0.beta.1 → 3.3.0.beta.2

data/doc/build.txt

@@ -1174,3 +1174,49 @@ So if you change icon of application, you have to restart device/simulator(unins
 
 ### Symbian
 You can change icon for your Symbian application replacing icon.svg which is in your application icon folder with a new one.
+
+## Upgrade application
+Rhodes 3.3 support application code upgrade for iPhone(non AppStore distribution) and Windows Mobile.
+
+### Prepare application package
+
+To prepare upgrade package for iPhone run in application folder:
+
+	:::term
+    $ rake build:iphone:upgrade_package
+
+Application package will be placed to <app_root>/bin/target/iphone
+
+To prepare upgrade package for Windows Mobile run in application folder:
+
+	:::term
+    $ rake build:wm:upgrade_package
+    
+Application package will be placed to <app_root>/bin/target/wmp6
+
+### Upgrade package from running application
+
+Download package:
+    :::ruby
+    if !::Rho::RhoSupport.rhobundle_download(url_to_package, url_for(:action => :httpdownload_callback))
+        render :action =>:error    
+    else
+        render :action => :wait_download, :back => '/app'
+    end    
+
+Unzip and replace package:
+    :::ruby
+    if System.unzip_file(::Rho::RhoSupport.rhobundle_getfilename())==0
+        System.replace_current_bundle( File.dirname(::Rho::RhoSupport.rhobundle_getfilename()) )
+        render :action => :wait_replace, :back => '/app'
+    else
+        WebView.navigate url_for :action => :error    
+    end
+
+Application will restart automatically.
+
+NOTE: On iPhone application has to be manually started.
+
+    
+### Sample
+See [Reload bundle demo](http://github.com/rhomobile/ReloadBundleDemo) for more information.

data/doc/device-caps.txt

@@ -627,6 +627,71 @@ In callback:
 ### Sample
 See controller and view in the /app/BarcodeRecognizer folder of the [System API Samples application](http://github.com/rhomobile/rhodes-system-api-samples/tree/master/app/BarcodeRecognizer/controller.rb) for more information.
 
+## Barcode for Motorola devices
+Rhodes 3.3 and RhoElements 2.0 support Motorola barcode scanner devices. Install RhoElements gem or RhoStudio and start developing for Motorola Windows Mobile, Windows CE and Android(ET1) devices .
+
+To enable add to build.yml:
+
+    capabilities:
+    -motorola
+
+    extensions: ["barcode-moto"]
+  
+Barcode API :
+
+Get a list of scanners present on the device. Return array of hashes ('name','id'):
+
+	:::ruby
+    Barcode.enumerate 
+    
+Enables the scanner. barcode_callback get the same parameters as Barcode.take_barcode:
+
+    :::ruby
+    Barcode.enable(url_for(:action => :barcode_callback), {:name=>name_from_enumerate})
+
+Callback parameters:
+
+* "status" - "ok" or "cancel"
+* "barcode" - recognized barcode string
+
+Disables the currently enabled scanner. This reverts the scanner to its default state and flushes any current decoder settings
+
+    :::ruby    
+    Barcode.disable
+
+Performs a soft trigger start. If the scan does not result in a decode it is necessary to perform a soft stop before another soft start    
+
+    :::ruby    
+    Barcode.start
+
+Performs a soft trigger stop     
+
+    :::ruby    
+    Barcode.stop 
+
+Enables the scanner and start scanner. Before callback is called scanner is disabled:
+
+    :::ruby
+    Barcode.take_barcode(url_for(:action => :barcode_callback), {:name=>name_from_enumerate})
+
+Callback parameters:
+
+* "status" - "ok" or "cancel"
+* "barcode" - recognized barcode string
+
+### Sample
+See controller and view in the /app/BarcodeRecognizerMoto folder of the [System API Samples application](http://github.com/rhomobile/rhodes-system-api-samples/tree/master/app/BarcodeRecognizerMoto/controller.rb) for more information.
+
+## WebKit browser for Motorola devices
+Rhodes 3.3 and RhoElements 2.0 support Motorola WebKit browser for Windows Mobile, Windows CE and Android (ET1) devices.
+
+To enable: install RhoElements gem or RhoStudio and add to build.yml
+
+    capabilities:
+    -motorola
+
+    extensions: ["webkit-browser"]
+
 ## Signature Capture
 
 The Signature Capture API allow take a signature and save it as an image:

data/platform/bb/RubyVM/src/com/rho/RhoLogger.java

@@ -164,7 +164,7 @@ public class RhoLogger {
 	    	makeStringSize(m_category,15) + "| ";
 	}
 
-	private void logMessage( int severity, String msg ){
+	public void logMessage( int severity, String msg ){
 		logMessage(severity, msg, null, false );
 	}
 	private void logMessage( int severity, String msg, Throwable e ){

data/platform/bb/RubyVM/src/com/rho/net/RhoConnection.java

@@ -683,6 +683,9 @@ public class RhoConnection implements IHttpConnection {
 			}else if ( model.equalsIgnoreCase("resetDBOnSyncUserChanged") ){
 				RhoAppAdapter.resetDBOnSyncUserChanged();
 				return true;
+			}else if ( model.equalsIgnoreCase("logger") ){
+				processLogger();
+				return true;
 			}
 
 		}else if ( application.equalsIgnoreCase("shared") )
@@ -690,6 +693,37 @@ public class RhoConnection implements IHttpConnection {
 		
 		return false;
 	}
+
+	void processLogger()
+	{
+	    int nLevel = 0;
+	    String strMsg = "", strCategory = "";
+
+	    Tokenizer oTokenizer = new Tokenizer(uri.getQueryString(), "&");
+	    while (oTokenizer.hasMoreTokens()) 
+	    {
+		    String tok = oTokenizer.nextToken();
+		    if (tok.length() == 0)
+			    continue;
+
+	        if ( tok.startsWith("level=") )
+	        {
+	            String strLevel = tok.substring(6);
+	            nLevel = Integer.parseInt(strLevel); 
+	        }else if ( tok.startsWith("msg=") )
+	        {
+	            strMsg = URI.urlDecode(tok.substring(4));
+	        }else if ( tok.startsWith( "cat=") )
+	        {
+	            strCategory = URI.urlDecode(tok.substring(4));
+	        }
+	    }
+
+	    RhoLogger log = new RhoLogger(strCategory);
+	    log.logMessage(nLevel, strMsg );
+		
+		respondOK();
+	}
 	
 	void showGeoLocation(){
 		String location = "";

data/platform/bb/RubyVM/src/com/rho/net/URI.java

@@ -1306,6 +1306,12 @@ import com.rho.Tokenizer;
 	  for  (int index=0; index < len ; index++)
 	  {
     	char c1 = fullPath.charAt(index);
+		if (c1 == '+') 
+		{
+			sb.append(' ');
+			continue;
+		}
+    	
 		if (c1 != '%') 
 		{
 			sb.append(c1);

data/platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java

@@ -102,7 +102,7 @@ public class BrowserAdapter5 implements IBrowserAdapter
 			if ( url.startsWith("http:/") && !url.startsWith("http://") )
 				url = RhodesApp.getInstance().getHomeUrl() + url.substring(5);
 				
-    		if ( RhodesApp.getInstance().isRhodesAppUrl(url) || URI.isLocalData(url) )
+    		if ( RhodesApp.getInstance().isRhodesAppUrl(url) ) //|| URI.isLocalData(url) )
     		{
                 HttpConnection connection = Utilities.makeConnection(url, request.getHeaders(), null, null);
 

data/platform/bb/rhodes/src/com/rho/BrowserAdapter.java

@@ -275,7 +275,9 @@ public class BrowserAdapter implements RenderingApplication, IBrowserAdapter
         
         try
         {
-        	if (referrer == null || URI.isLocalData(url) || !m_bLoadImageAsync) 
+        	if ( URI.isLocalData(url) )
+        		SecondaryResourceFetchThread.enqueue(resource, referrer);
+        	else if (referrer == null || /*URI.isLocalData(url) ||*/ !m_bLoadImageAsync) 
         	{
 	        	boolean bLocalHost = RhodesApp.getInstance().isRhodesAppUrl(url);
 	        	if ( bLocalHost && m_connResource!= null)

data/platform/bb/rhodes/src/com/rho/BrowserAdapter5.java

@@ -102,7 +102,7 @@ public class BrowserAdapter5 implements IBrowserAdapter
 			if ( url.startsWith("http:/") && !url.startsWith("http://") )
 				url = RhodesApp.getInstance().getHomeUrl() + url.substring(5);
 				
-    		if ( RhodesApp.getInstance().isRhodesAppUrl(url) || URI.isLocalData(url) )
+    		if ( RhodesApp.getInstance().isRhodesAppUrl(url) ) //|| URI.isLocalData(url) )
     		{
                 HttpConnection connection = Utilities.makeConnection(url, request.getHeaders(), null, null);
 

data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java

@@ -210,6 +210,9 @@ public class NetworkAccess implements INetworkAccess {
 			return new RhoConnection(uri);
 		}
 		
+		if ( URI.isLocalData(url) )
+			return new BBHttpConnection((HttpConnection)Connector.open(url));
+			
 		int fragment = url.indexOf('#');
 		if (-1 != fragment) {
 			url = url.substring(0, fragment);

data/platform/iphone/Classes/AppManager/AppManager.m

@@ -609,13 +609,12 @@ int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
             return 1;
         }
 #endif
-        UIDevice *device = [UIDevice currentDevice];
-        NSString *version = [device systemVersion];
-        if ([version length] >= 2 && [[version substringToIndex:2] isEqualToString:@"4."])
+        if (get_scale() > 1.2) {
             *resValue = rho_ruby_create_double(RHO_IPHONE4_PPI);
-        else
+        }
+        else {
             *resValue = rho_ruby_create_double(RHO_IPHONE_PPI);
-        
+        }
         return 1;
     }
     else if (strcasecmp("device_name", szPropName) == 0) {

data/platform/iphone/Classes/Camera/PickImageDelegate.m

@@ -403,21 +403,21 @@ VALUE get_camera_info(const char* camera_type) {
             w = 1600;
             h = 1200;
         }
-    }
+    } else
 	if ([platform isEqualToString:@"iPhone1,2"]) {
         // iPhone 3G
         if (!isFront) {
             w = 1600;
             h = 1200;
         }
-    }
+    } else
 	if ([platform hasPrefix:@"iPhone2"]) {
         // iPhone 3GS
         if (!isFront) {
             w = 2048;
             h = 1536;
         }
-    }
+    } else
 	if ([platform hasPrefix:@"iPhone3"]) {
         // iPhone 4
         if (!isFront) {
@@ -428,18 +428,30 @@ VALUE get_camera_info(const char* camera_type) {
             w = 640;
             h = 480;
         }
-    }
+    } else
 	if ([platform hasPrefix:@"iPhone4"]) {
-        // iPhone 5
+        // iPhone 4S
         if (!isFront) {
-            w = 2592;
-            h = 1936;
+            w = 2448;
+            h = 3264;
         }
         else {
             w = 640;
             h = 480;
         }
-    }
+    } else 
+        if ([platform hasPrefix:@"iPhone"]) {
+            // iPhone 5 ?
+            if (!isFront) {
+                w = 2448;
+                h = 3264;
+            }
+            else {
+                w = 640;
+                h = 480;
+            }
+        } else 
+        
     
 	if ([platform isEqualToString:@"iPod1,1"]) {
         // iPod Touch 1

data/platform/iphone/Info.plist

@@ -38,7 +38,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.2.1</string>
+	<string>3.3.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchImageFile</key>

data/platform/shared/common/RhodesApp.cpp

@@ -43,6 +43,7 @@
 #include "rubyext/GeoLocation.h"
 #include "common/app_build_configs.h"
 #include "unzip/unzip.h"
+#include "common/Tokenizer.h"
 
 #include <algorithm>
 
@@ -664,6 +665,36 @@ static void callback_syncdb(void *arg, String const &/*query*/ )
     rho_http_sendresponse(arg, "");
 }
 
+static void callback_logger(void *arg, String const &query )
+{
+    int nLevel = 0;
+    String strMsg, strCategory;
+
+    CTokenizer oTokenizer(query, "&");
+    while (oTokenizer.hasMoreTokens()) 
+    {
+	    String tok = oTokenizer.nextToken();
+	    if (tok.length() == 0)
+		    continue;
+
+        if ( String_startsWith( tok, "level=") )
+        {
+            String strLevel = tok.substr(6);
+            convertFromStringA( strLevel.c_str(), nLevel ); 
+        }else if ( String_startsWith( tok, "msg=") )
+        {
+            strMsg = rho::net::URI::urlDecode(tok.substr(4));
+        }else if ( String_startsWith( tok, "cat=") )
+        {
+            strCategory = rho::net::URI::urlDecode(tok.substr(4));
+        }
+    }
+
+    rhoPlainLog( "", 0, nLevel, strCategory.c_str(), strMsg.c_str() );
+
+    rho_http_sendresponse(arg, "");
+}
+
 static void callback_redirect_to(void *arg, String const &strQuery )
 {
     size_t nUrl = strQuery.find("url=");
@@ -761,6 +792,7 @@ void CRhodesApp::initHttpServer()
     m_httpServer->register_uri("/system/loadserversources", callback_loadserversources);
     m_httpServer->register_uri("/system/resetDBOnSyncUserChanged", callback_resetDBOnSyncUserChanged);
     m_httpServer->register_uri("/system/loadallsyncsources", callback_loadallsyncsources);
+    m_httpServer->register_uri("/system/logger", callback_logger);
 }
 
 const char* CRhodesApp::getFreeListeningPort()

data/platform/shared/net/URI.cpp

@@ -230,6 +230,11 @@ String URI::urlEncode(const String& fullPath)
 /*static*/ void URI::urlDecode(const String &url, String& ret )
 {
 	for (const char *s = url.c_str(); *s != '\0'; ++s) {
+		if (*s == '+') {
+			ret.push_back(' ');
+			continue;
+		}
+
 		if (*s != '%') {
 			ret.push_back(*s);
 			continue;

data/platform/symbian/rholib/rholib.pro

@@ -28,6 +28,7 @@ SOURCES += \
     ../../shared/common/RhodesApp.cpp \
     ../../shared/common/RhoConf.cpp \
     ../../shared/common/AppMenu.cpp \
+    ../../shared/common/BundleManager.cpp \
     ../../shared/logging/RhoPlainLog.cpp \
     ../../shared/logging/RhoLogSink.cpp \
     ../../shared/logging/RhoLogConf.cpp \

data/version

@@ -1 +1 @@
-3.3.0.beta.1
+3.3.0.beta.2

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 62196465
+  hash: 62196471
   prerelease: true
   segments: 
   - 3
   - 3
   - 0
   - beta
-  - 1
-  version: 3.3.0.beta.1
+  - 2
+  version: 3.3.0.beta.2
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-24 00:00:00 -08:00
+date: 2011-12-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -1063,6 +1063,7 @@ files:
 - lib/test/rho_stubs.rb
 - lib/test/syncdb.sqlite
 - LICENSE
+- Manifest.txt
 - platform/android/build/android.rake
 - platform/android/build/android_tools.rb
 - platform/android/build/androidcommon.rb
@@ -4942,6 +4943,7 @@ files:
 - res/icons/rhosim.psd
 - rhobuild.yml.example
 - rhodes.gemspec
+- rhomobile-debug-1.0.6.gem
 - rhomobile-debug.gemspec
 - spec/framework_spec/app/application.rb
 - spec/framework_spec/app/index.erb