rhodes 2.2.0.beta.1 → 2.2.0.beta.2

data/lib/framework/rhom/rhom_db_adapter.rb

@@ -216,7 +216,7 @@ class RhomDbAdapter
             quests << ' ' << op << ' '
         end
     
-        quests << "#{key}=?"
+        quests << "\"#{key}\"=?"
         vals << val
     end
     
@@ -327,7 +327,7 @@ class RhomDbAdapter
             quests << ','
         end
     
-        quests << "#{key}=?"
+        quests << "\"#{key}\"=?"
         vals << val
     end
     

data/platform/android/Rhodes/gen/com/rhomobile/rhodes/Manifest.java

@@ -0,0 +1,14 @@
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package com.rhomobile.rhodes;
+
+public final class Manifest {
+    public static final class permission {
+        public static final String C2D_MESSAGE="com.rhomobile.rhodes.permission.C2D_MESSAGE";
+    }
+}

data/platform/android/build/android.rake

@@ -1286,14 +1286,13 @@ namespace "run" do
         Thread.new {
           sleep 1000
 
-          if RUBY_PLATFORM =~ /darwin/
-            # OS X:
-            `killall -9 adb`
-            `killall -9 emulator`
-          else
+          if RUBY_PLATFORM =~ /windows|cygwin|mingw/
             # Windows
             `taskkill /F /IM adb.exe`
             `taskkill /F /IM emulator.exe`
+          else
+            `killall -9 adb`
+            `killall -9 emulator`
           end
         }
 
@@ -1331,14 +1330,13 @@ namespace "run" do
         Jake.process_spec_results(start)        
         
         # stop app
-        if RUBY_PLATFORM =~ /darwin/
-          # OS X:
-          `killall -9 adb`
-          `killall -9 emulator`
-        else
+        if RUBY_PLATFORM =~ /windows|cygwin|mingw/
           # Windows
           `taskkill /F /IM adb.exe`
           `taskkill /F /IM emulator.exe`
+        else
+          `killall -9 adb`
+          `killall -9 emulator`
         end
 
         $stdout.flush

data/rhodes.gemspec

@@ -3,7 +3,7 @@ require "lib/rhodes.rb"
 
 Gem::Specification.new do |s|
   s.name = %q{rhodes}
-  s.version = '2.2.0.beta.1'
+  s.version = '2.2.0.beta.2'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhomobile"]

data/spec/phone_spec/app/spec/rhom_object_spec.rb

@@ -433,9 +433,52 @@ describe "Rhom::RhomObject" do
     
     item2.propOne.should == '1'
     item2.TwoProps.should == '2'
+
+    new_attributes  = {'propOne'=>'4', 'TwoProps'=>'3'}
+    item2.update_attributes(new_attributes)
+
+    item3 = getAccount.find(item.object)
+    item3.propOne.should == new_attributes['propOne']
+    item3.TwoProps.should == new_attributes['TwoProps']
+  end
+
+  it "should make new record diff case name" do
+    new_attributes  = {'propOne'=>'1', 'TwoProps'=>'2'}
+    item = getAccount.new( new_attributes )
+    item.propOne.should == '1'
+    item.TwoProps.should == '2'
+    item.save
+    
+    item2 = getAccount.find(item.object)
+    item.vars.should == item2.vars    
+    
+    item2.propOne.should == '1'
+    item2.TwoProps.should == '2'
+    
+    item2.propOne = '3'
+    item2.TwoProps = '4'
+    item2.save
+
+    item3 = getAccount.find(item.object)
+    item3.propOne.should == item2.propOne
+    item3.TwoProps.should == item2.TwoProps
     
   end
   
+  it "should update a record  diff case name" do
+    new_attributes = {"name"=>"Mobio US"}
+    @account = getAccount.find("44e804f2-4933-4e20-271c-48fcecd9450d")
+    @account.update_attributes(new_attributes)
+    @new_acct = getAccount.find("44e804f2-4933-4e20-271c-48fcecd9450d")
+    @new_acct.name.should == "Mobio US"
+    @new_acct.industry.should == "Technology"
+
+    if $spec_settings[:sync_model]    
+        records = ::Rho::RHO.get_user_db().select_from_table('changed_values','*', 'update_type' => 'update')
+        records.length.should == 1
+    end    
+  end
+  
   it "should update a record with full mode" do
     records = ::Rho::RHO.get_user_db().select_from_table('changed_values','*', 'update_type' => 'update')
     records.length.should == 0

data/spec/phone_spec/app/spec_runner.rb

@@ -19,7 +19,8 @@ class SpecRunner < MSpecScript
           {:schema_model=>false, :sync_model=>true}, {:schema_model=>false, :sync_model=>false} ] ]
 
     config[:files] << "spec/contacts_spec" unless System.get_property('device_name') == 'Win32'
-    config[:files] << "spec/events_spec"  unless System.get_property('device_name') == 'Win32'
+    # Disable events specs on Android because emulator doesn't contain Calendar provider
+    config[:files] << "spec/events_spec"  unless System.get_property('device_name') == 'Win32' or System.get_property('platform') == 'ANDROID'
     
     config[:files] << "spec/barcode_spec" unless System.get_property('device_name') == 'Win32'            
     config[:files] << "spec/mapview_spec"  unless System.get_property('platform') == 'WINDOWS'    

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 62196417
+  hash: 62196423
   prerelease: true
   segments: 
   - 2
   - 2
   - 0
   - beta
-  - 1
-  version: 2.2.0.beta.1
+  - 2
+  version: 2.2.0.beta.2
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 -07:00
+date: 2010-10-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -766,6 +766,7 @@ files:
 - platform/android/build/RhodesGEN_build.files
 - platform/android/build/RhodesSRC_build.files
 - platform/android/Rhodes/AndroidManifest.xml
+- platform/android/Rhodes/gen/com/rhomobile/rhodes/Manifest.java
 - platform/android/Rhodes/gen/com/rhomobile/rhodes/R.java
 - platform/android/Rhodes/jni/include/rhodes/details/rhojava.inc
 - platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_alert_Alert.h