rhodes 3.2.0.beta.7 → 3.2.0.beta.8

data/Rakefile

@@ -970,6 +970,7 @@ namespace "rhomobile-debug" do
       chdir 'rhomobile-debug'
       
       puts "Loading gemspec"
+      require 'rubygems'
       spec = Gem::Specification.load('rhomobile-debug.gemspec')
 
       puts "Building gem"

data/bin/set-rhodes-sdk

@@ -15,7 +15,8 @@ if File.exists? "build.yml"
       YAML.dump( $app_config, out )
     end
 
-    rakefilepath = File.join( File.dirname(`get-rhodes-info --rhodes-path`), 'res/generators/templates/application/Rakefile' )
+    rakefilepath = File.join( `get-rhodes-info --rhodes-path`.chomp(), 'res/generators/templates/application/Rakefile' )
+    puts "Application Rakefile has been updated to use latest Rhodes gem."
     cp rakefilepath, '.'
   end
 end

data/doc/device-caps.txt

@@ -299,6 +299,8 @@ Remove contact identified by the provided id from the phonebook. (delete)
 
 On all devices, properties currently supported are: "id","first_name","last_name","mobile_number","home_number","business_number","email_address","company_name"
 
+### iPhone
+
 On iPhone, additional contact properties are supported. 
 
 General: 
@@ -326,6 +328,38 @@ Phone numbers:
 Home pages: 
 "home_page"
 
+### Android
+
+On Android extended RhoContact::find functionality is implemented.
+In addition to common usage described above it is allowed to pass additional parameter values:
+
+* :all - get all contacts as usual 
+* :first - find first contact from list
+* :count - returns count of contacts
+
+For these selectors an additional params hash may be used. The next keys and values are recognized in additional params:
+
+* :per_page - max count if contacts returned by find
+* :offset - offset from begin of contacts' list
+These two parameters are used to paginate contacts list. If used with :count exact number of returned contacts can be determined (for example for last page).
+* :select - list of contact properties have to be selected from phonebook (Use it to enchance query performance)
+
+On Android the nexts contact properties are supported (every of them may be used in :select list):
+
+General:
+"id", "display_name", "first_name", "last_name"
+
+Phone numbers:
+"mobile_number", "home_number", "business_number"
+
+E-mails:
+"email_address"
+
+Company:
+"company_name"
+
+**NOTE: In most cases the result of RhoContact::find query may return more contact properties the defined in :select**
+
 ### Sample
 For examples on how to use the API provided by this class, see the view and controller in the /app/Contacts folder in the [System API Samples application](http://github.com/rhomobile/rhodes-system-api-samples/tree/master/app/Contacts/controller.rb).
 

data/lib/extensions/debugger/CHANGELOG

@@ -1,3 +1,6 @@
+## 1.0.3
+* Fix working with Ruby 1.9.2
+
 ## 1.0.2
 * Change debug port parameter name
 * Fix issue with run from Rhosync

data/lib/extensions/debugger/debugger.rb

@@ -21,12 +21,13 @@ def debug_read_cmd(io,wait)
 end
 
 def execute_cmd(cmd, advanced)
+  #$_s.write("execute_cmd start\n")
   cmd = URI.unescape(cmd.gsub(/\+/,' ')) if advanced
   puts "[Debugger] Executing: #{cmd.inspect}"
   result = ""
   error = '0';
   begin
-    result = eval(cmd, $_binding).inspect
+    result = eval(cmd.to_s, $_binding).inspect
   rescue Exception => exc
     error = '1';
     result = "#{$!}".inspect
@@ -34,6 +35,7 @@ def execute_cmd(cmd, advanced)
   
   cmd = URI.escape(cmd.sub(/[\n\r]+$/, ''), Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")) if advanced
   $_s.write("EV" + (advanced ? "L:#{error}:#{cmd}:" : ':'+(error.to_i != 0 ? 'ERROR: ':'')) + result + "\n")
+  #$_s.write("execute_cmd end\n")
 end
 
 def get_variables(scope)
@@ -68,9 +70,9 @@ def get_variables(scope)
     vars.each do |v|
       if v !~ /^\$(=|KCODE)$/
         begin
-          result = eval(v,$_binding).inspect
+          result = eval(v.to_s, $_binding).inspect
         rescue Exception => exc
-          #$_s.write("get var exception\n")
+          $_s.write("get var exception\n")
           result = "#{$!}".inspect
         end
         $_s.write("V:#{vartype}:#{v}:#{result}\n")

data/platform/bb/rhodes/src/com/rho/rubyext/XMLParser.java

@@ -162,7 +162,7 @@ public class XMLParser extends RubyBasic {
 	
     private void parse(String strXML)throws Exception 
     {
-		InputStream in = new ByteArrayInputStream(strXML.getBytes());
+		InputStream in = new ByteArrayInputStream(strXML.getBytes("UTF-8"));
 		
 		parse(in);
     }

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

@@ -215,6 +215,16 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
 //#endif
     BOOL nameChanged = ![self isContentsEqual:fileManager first:filePathNew second:filePathOld];
 
+    BOOL restoreSymLinks_only = NO;
+
+    {
+        NSString* testName = [rhoRoot stringByAppendingPathComponent:@"lib"];
+        if (![fileManager fileExistsAtPath:testName]) {
+            restoreSymLinks_only = YES;
+        }
+        restoreSymLinks_only = NO;
+    }
+    
     BOOL contentChanged;
     if (nameChanged)
         contentChanged = YES;
@@ -223,26 +233,43 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
 		filePathOld = [rhoRoot stringByAppendingPathComponent:@"hash"];
 
         contentChanged = ![self isContentsEqual:fileManager first:filePathNew second:filePathOld];
+        
+        // check for lost sym-links (upgrade OS or reinstall application without change version)
+        if (!contentChanged) {
+            // check exist of sym-link
+            NSString* testName = [rhoRoot stringByAppendingPathComponent:@"lib"];
+            if (![fileManager fileExistsAtPath:testName]) {
+                NSLog(@" Can not found main Sym-Link - we should restore all sym-links !");
+                contentChanged = YES;
+                restoreSymLinks_only = YES;
+            }
+            else {
+                NSLog(@" Main Sym-Link founded - disable restoring !");
+            }
+        }
+        
 	}
+
+    NSString* testName = [rhoRoot stringByAppendingPathComponent:@"lib"];
+    BOOL libExist = [fileManager fileExistsAtPath:testName];
+    if (libExist) {
+        NSLog(@" Lib File is Exist: %@", testName);
+    }
+    else {
+        NSLog(@" Lib File is NOT Exist: %@", testName);
+    }
 	
+    
     if (contentChanged) {
 #ifdef RHO_DONT_COPY_ON_START
         // we have next situations when we should remove old content:
         // 1. we upgrade old version (where we copy all files)
         //    we should remove all files
         // 2. we upgrade version with symlinks
-        //    we should remove only symlinks 
+        //    we should remove only symlinks
+        // 3. we should only restore sym-lins after that was cleared - OS upgrade/reinstall app with the same version/restore from bakup etc. 
         // we check old "lib" file - if it is SymLink then we have new version of Rhodes (with SymLinks instead of files)
 
-        NSString* testName = [rhoRoot stringByAppendingPathComponent:@"lib"];
-        //BOOL libExist = [fileManager fileExistsAtPath:testName];
-        //if (libExist) {
-        //    NSLog(@" Lib File is Exist: %@", testName);
-        //}
-        //else {
-        //    NSLog(@" Lib File is NOT Exist: %@", testName);
-        //}
-        
         BOOL isNewVersion = isPathIsSymLink(fileManager, testName);
         
         RhoFileManagerDelegate_RemoveOnly_SymLinks* myDelegate = nil;
@@ -296,26 +323,28 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
             [myDelegate release];
         }
         // copy "db"
-        NSString *copy_dirs[] = {@"db"};
-        for (int i = 0, lim = sizeof(copy_dirs)/sizeof(copy_dirs[0]); i < lim; ++i) {
-            BOOL remove = nameChanged;
-            if ([copy_dirs[i] isEqualToString:@"db"] && !hasOldName)
-                remove = NO;
-            NSString *src = [bundleRoot stringByAppendingPathComponent:copy_dirs[i]];
-            NSLog(@"copy src: %@", src);
-            NSString *dst = [rhoRoot stringByAppendingPathComponent:copy_dirs[i]];
-            NSLog(@"copy dst: %@", dst);
-            [self copyFromMainBundle:fileManager fromPath:src toPath:dst remove:remove];
-        }
-        // Finally, copy "hash" and "name" files
-        NSString *items[] = {@"hash", @"name"};
-        for (int i = 0, lim = sizeof(items)/sizeof(items[0]); i < lim; ++i) {
-            NSString *src = [bundleRoot stringByAppendingPathComponent:items[i]];
-            NSLog(@"copy src: %@", src);
-            NSString *dst = [rhoRoot stringByAppendingPathComponent:items[i]];
-            NSLog(@"copy dst: %@", dst);
-            [fileManager removeItemAtPath:dst error:&error];
-            [fileManager copyItemAtPath:src toPath:dst error:&error];
+        if (!restoreSymLinks_only) { 
+            NSString *copy_dirs[] = {@"db"};
+            for (int i = 0, lim = sizeof(copy_dirs)/sizeof(copy_dirs[0]); i < lim; ++i) {
+                BOOL remove = nameChanged;
+                if ([copy_dirs[i] isEqualToString:@"db"] && !hasOldName)
+                    remove = NO;
+                NSString *src = [bundleRoot stringByAppendingPathComponent:copy_dirs[i]];
+                NSLog(@"copy src: %@", src);
+                NSString *dst = [rhoRoot stringByAppendingPathComponent:copy_dirs[i]];
+                NSLog(@"copy dst: %@", dst);
+                [self copyFromMainBundle:fileManager fromPath:src toPath:dst remove:remove];
+            }
+            // Finally, copy "hash" and "name" files
+            NSString *items[] = {@"hash", @"name"};
+            for (int i = 0, lim = sizeof(items)/sizeof(items[0]); i < lim; ++i) {
+                NSString *src = [bundleRoot stringByAppendingPathComponent:items[i]];
+                NSLog(@"copy src: %@", src);
+                NSString *dst = [rhoRoot stringByAppendingPathComponent:items[i]];
+                NSLog(@"copy dst: %@", dst);
+                [fileManager removeItemAtPath:dst error:&error];
+                [fileManager copyItemAtPath:src toPath:dst error:&error];
+            }
         }
 #else
         NSString *dirs[] = {@"apps", @"lib", @"db", @"hash", @"name"};

data/platform/shared/RhoConnectClient/RhoConnectClient.cpp

@@ -123,13 +123,16 @@ void rho_connectclient_processmodels(RHOM_MODEL* pModels, int nModels)
             oUserDB.executeSQL("UPDATE sources SET sync_priority=?, sync_type=?, partition=?, schema=?, schema_version=?, associations=?, blob_attribs=? WHERE name=?",
                 model.sync_priority, getSyncTypeName(model.sync_type), model.partition, 
                 (model.type == RMT_PROPERTY_FIXEDSCHEMA ? "schema_model" : ""), "", strAssoc.c_str(), model.blob_attribs, model.name );
-                
+            
+            model.source_id = res.getIntByIdx(1);
+            
         }else //new model
         {
             oUserDB.executeSQL("INSERT INTO sources (source_id,name,sync_priority, sync_type, partition, schema,schema_version, associations, blob_attribs) values (?,?,?,?,?,?,?,?,?) ",
                 nStartModelID, model.name, model.sync_priority, getSyncTypeName(model.sync_type), model.partition, 
                 (model.type == RMT_PROPERTY_FIXEDSCHEMA ? "schema_model" : ""), "", strAssoc.c_str(), model.blob_attribs );
 
+            model.source_id = nStartModelID;
             nStartModelID++;
         }
     }
@@ -922,7 +925,7 @@ void rho_connectclient_free_sync_objectnotify(RHO_CONNECT_OBJECT_NOTIFY* pNotify
         free(pNotify->created_objects);
     }
     
-    memset( pNotify, 0, sizeof(RHO_CONNECT_NOTIFY) );        
+    memset( pNotify, 0, sizeof(RHO_CONNECT_OBJECT_NOTIFY) );        
 }
     
 unsigned long rho_connectclient_strarray_create()

data/platform/shared/RhoConnectClient/RhoConnectClient.h

@@ -38,7 +38,8 @@ typedef struct _RHOM_MODEL
 {
     const char* name;
     RHOM_MODEL_TYPE type;
-
+    int source_id; //generated when insert to database
+    
     RHOM_SYNC_TYPE sync_type;
     int  sync_priority;
 

data/rakefile.rb

@@ -970,6 +970,7 @@ namespace "rhomobile-debug" do
       chdir 'rhomobile-debug'
       
       puts "Loading gemspec"
+      require 'rubygems'
       spec = Gem::Specification.load('rhomobile-debug.gemspec')
 
       puts "Building gem"

data/rhomobile-debug.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rhomobile-debug"
-  s.version = "1.0.2"
+  s.version = "1.0.3"
   s.authors = ["Rhomobile"]
   s.date    = Time.now.strftime('%Y-%m-%d')
   s.description = %q{Rhomobile debugger extension}

data/spec/framework_spec/build.yml

@@ -1,7 +1,7 @@
 --- 
 name: framework_spec
 bbver: 4.6
-sdk: /Users/brian/work/rhodes
+sdk: ../../
 applog: rholog.txt
 version: 1.0.0
 vendor: rhomobile

data/spec/perfomance_spec/build.yml

@@ -1,7 +1,7 @@
 --- 
 name: perfomance_spec
 bbver: 5.0
-sdk: /Users/crystax/work/rhomobile/rhodes
+sdk: ../../
 applog: rholog.txt
 version: 1.0.0
 vendor: rhomobile

data/spec/phone_spec/app/spec/rho_controller_spec.rb

@@ -66,7 +66,10 @@ describe "url_for and link_to" do
 
     it "should generate urls for create or index actions" do
       @c.url_for(:action => :index, :id => '{12}').should == '/application/model'
-if !defined?(RHO_WP7)    
+      
+is_bb6 = System::get_property('platform') == 'Blackberry' && (System::get_property('os_version').split('.')[0].to_i >= 6)    
+      
+if !defined?(RHO_WP7) && !is_bb6
       @c.url_for(:action => :create).should == '/application/model'
 else
       @c.url_for(:action => :create).should == '/application/model/create'
@@ -90,7 +93,8 @@ end
     end
 
     it "should generate urls with a query" do
-if !defined?(RHO_WP7)    
+is_bb6 = System::get_property('platform') == 'Blackberry' && (System::get_property('os_version').split('.')[0].to_i >= 6)    
+if !defined?(RHO_WP7) && !is_bb6
       @c.url_for(:action => :create, :query => {:name => 'John Smith', 
         'address' => "http://john.smith.com"}).should == '/application/model?name=John%20Smith&address=http%3A%2F%2Fjohn.smith.com'
 else

data/spec/phone_spec/app/spec/rhofile_spec.rb

@@ -94,7 +94,7 @@ describe "RhoFile" do
     it "should isfileexist" do
         File.exist?(Rho::RhoApplication::get_model_path('app', 'spec')).should == true if System.get_property('platform') != 'Blackberry'
         File.exist?(Rho::RhoApplication::get_blob_folder()).should ==  true 
-        File.exist?( File.join( __rhoGetCurrentDir(), 'RhoLog.txt')).should ==  true 
+        File.exist?( File.join( __rhoGetCurrentDir(), 'rholog.txt')).should ==  true 
         
         bExc = false
         begin

data/spec/phone_spec/build.yml

@@ -1,7 +1,7 @@
 --- 
 name: phone_spec
 bbver: 6.0
-sdk: /Users/crystax/work/rhomobile/rhodes
+sdk: ../../
 #applog: rholog.txt
 version: 1.0.0
 vendor: rhomobile

data/version

@@ -1 +1 @@
-3.2.0.beta.7
+3.2.0.beta.8

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 62196461
+  hash: 62196467
   prerelease: true
   segments: 
   - 3
   - 2
   - 0
   - beta
-  - 7
-  version: 3.2.0.beta.7
+  - 8
+  version: 3.2.0.beta.8
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-18 00:00:00 -07:00
+date: 2011-10-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency