rhodes 1.5.5 → 2.0.0.beta1

data/spec/framework_spec/app/spec/rho_spec.rb

@@ -27,7 +27,7 @@ describe "Rho" do
   end
   
   it "should populate configuration in sources table" do
-    sources = Rhom::RhomDbAdapter::select_from_table('sources','*')
+    sources = ::Rho::RHO.get_user_db().select_from_table('sources','*')
     sources.size.should > 1
   end
   

data/spec/framework_spec/app/spec/rhom_object_spec.rb

@@ -26,11 +26,11 @@ describe "Rhom::RhomObject" do
   before do
     SyncEngine.stub!(:dosync).and_return(true)
   end
-
-  #it "should set source_id attributes" do
-    #Account.get_source_id.should == "2"
-    #Case.get_source_id.should == "1"
-  #end
+  
+  it "should set source_id attributes" do
+    Account.get_source_id.should == "23"
+    Case.get_source_id.should == "1"
+  end
   
   it "should dynamically assign values" do
     account = Account.new
@@ -126,8 +126,8 @@ describe "Rhom::RhomObject" do
   end
   
   it "should create records with no attribs in database" do
-    ::Rhom::RhomDbAdapter.delete_all_from_table('object_values')
-    res = ::Rhom::RhomDbAdapter.select_from_table('object_values',"*")
+    ::Rho::RHO.get_user_db().delete_all_from_table('object_values')
+    res = ::Rho::RHO.get_user_db().select_from_table('object_values',"*")
     res.length.should == 0
     vars = {"name"=>"foobarthree", "industry"=>"entertainment"}
     account = Account.new(vars)
@@ -203,10 +203,10 @@ describe "Rhom::RhomObject" do
     @account3.name.should == vars['name']
     @account3.industry.should == update_attributes['industry']
 
-    records = Rhom::RhomDbAdapter::select_from_table('changed_values','*', 'update_type' => 'create')
+    records = ::Rho::RHO.get_user_db().select_from_table('changed_values','*', 'update_type' => 'create')
     records.length.should == 2
     
-    records = Rhom::RhomDbAdapter::select_from_table('changed_values','*', 'update_type' => 'update')
+    records = ::Rho::RHO.get_user_db().select_from_table('changed_values','*', 'update_type' => 'update')
     records.length.should == 0
   end
   
@@ -229,10 +229,10 @@ describe "Rhom::RhomObject" do
     @account3.name.should == vars['name']
     @account3.industry.should == update_attributes['industry']
 
-    records = Rhom::RhomDbAdapter::select_from_table('changed_values','*', 'update_type' => 'create')
+    records = ::Rho::RHO.get_user_db().select_from_table('changed_values','*', 'update_type' => 'create')
     records.length.should == 2
     
-    records = Rhom::RhomDbAdapter::select_from_table('changed_values','*', 'update_type' => 'update')
+    records = ::Rho::RHO.get_user_db().select_from_table('changed_values','*', 'update_type' => 'update')
     records.length.should == 0
   end
   
@@ -286,8 +286,8 @@ describe "Rhom::RhomObject" do
     @new_acct.acct_object.should == "same object"
   end
   
-  it "should _NOT_ set 'type' field for a record" do
-    new_attributes = {"type"=>"Partner"}
+  it "should _NOT_ set 'attrib_type' field for a record" do
+    new_attributes = {"attrib_type"=>"Partner"}
     @account = Account.find('44e804f2-4933-4e20-271c-48fcecd9450d')
     @account.update_attributes(new_attributes)
   
@@ -354,7 +354,7 @@ describe "Rhom::RhomObject" do
     @new_acct.name.should == "Mobio India"
     @new_acct.industry.should == "Technology"
     
-    records = Rhom::RhomDbAdapter::select_from_table('changed_values','*', 'update_type' => 'update')
+    records = ::Rho::RHO.get_user_db().select_from_table('changed_values','*', 'update_type' => 'update')
     records.length.should == 1
   end
   
@@ -426,7 +426,7 @@ describe "Rhom::RhomObject" do
     @accts = Account.find( :all, 
        :conditions => [cond1, cond2], 
        :op => 'AND', 
-       :select => ['name','industry'])
+       :select => ['name','industry','description'])
   
     @accts.length.should == 1
     @accts[0].name.should == "Mobio India"
@@ -512,7 +512,7 @@ describe "Rhom::RhomObject" do
     @acct = Account.new({'image_uri'=>"/db/images/mynewimage.png"})
     @acct.name = "my new acct"
     @acct.save
-    @res = Rhom::RhomDbAdapter::select_from_table('object_values','*', 'attrib_type' => "blob.file")
+    @res = ::Rho::RHO.get_user_db().select_from_table('object_values','*', 'attrib_type' => "blob.file")
     @res.length.should == 1
   end
   
@@ -585,25 +585,18 @@ describe "Rhom::RhomObject" do
     @accts[0].name.should == "Mobio India"
     @accts[0].industry.should == "Technology"
   end
-  
+
   describe "Rhom#paginate" do
     before(:each) do
       Rho::RhoUtils.load_offline_data(['object_values'], 'spec/pagination')
     end
 
-    after(:each) do
-      Rhom::RhomDbAdapter.start_transaction
-      #Rhom::RhomAttribManager.reset_all
-      Rhom::RhomDbAdapter.delete_all_from_table('client_info')
-      Rhom::RhomDbAdapter.delete_all_from_table('object_values')
-      Rhom::RhomDbAdapter.delete_all_from_table('changed_values')
-      Rhom::RhomDbAdapter.commit
-    end
-    
-    @expected = [{:object => '3788304956', :name => 'c2z5izd8w9', :address => '6rd9nv8dml', :industry => 'hxua4d6ttl'},
+    @expected = [
+                {:object => '3788304956', :name => 'c2z5izd8w9', :address => '6rd9nv8dml', :industry => 'hxua4d6ttl'},
+                #{:object => '8763523348', :name => '39afj8vbj6', :address => 'x7jincp3xj', :industry => 'sge128jo9o'},    
                 {:object => '7480317731', :name => '79nqr7ekzr', :address => 'emv1tezmdf', :industry => '1zg7f7q6ib'},
                 {:object => '9897778878', :name => 'n5qx54qcye', :address => 'stzc1x7upn', :industry => '9kdinrjlcx'}]
-  
+
     it "should support paginate with no options" do
       3.times do |x|
         @accts = Account.paginate(:page => x)
@@ -636,6 +629,32 @@ describe "Rhom::RhomObject" do
       @accts[0].address.should == @expected[0][:address]
       @accts[0].industry.should == @expected[0][:industry]
     end
+
+    it "should support paginate with options, conditions and order" do
+      @accts = Account.paginate(:page => 0, :per_page => 1, :conditions => {'name' => 'test'}, :order=> 'name')
+      @accts.length.should == 1
+
+      @accts = Account.paginate(:page => 1, :per_page => 1, :conditions => {'name' => 'test'}, :order=> 'name')
+      @accts.length.should == 1
+
+      @accts = Account.paginate(:page => 2, :per_page => 1, :conditions => {'name' => 'test'}, :order=> 'name')
+      @accts.length.should == 1
+
+      @accts = Account.paginate(:page => 3, :per_page => 1, :conditions => {'name' => 'test'}, :order=> 'name')
+      @accts.length.should == 0
+    end
+    
+    it "should support paginate with options and order" do
+      @accts = Account.paginate(:per_page => 20, :order=> 'name')
+      @accts.length.should == 20
+
+      @accts2 = Account.paginate(:per_page => 20, :order=> 'name', :page => 1)
+      @accts2.length.should == 10
+      
+      @accts3 = Account.paginate(:per_page => 20, :order=> 'name', :page => 2)
+      @accts3.length.should == 0
+    end
+    
   end
 
 end

data/spec/framework_spec/app/spec/rhom_spec.rb

@@ -39,20 +39,20 @@ describe "Rhom" do
 #    verify_reset
 #  end
   
-  it "should call select_from_table with select array" do
-    sel_arr = ['name','industry']
-    @res = Rhom::RhomDbAdapter::select_from_table('object_values', '*', {'object' => '44e804f2-4933-4e20-271c-48fcecd9450d'}, nil, sel_arr)
-    @res.length.should == 2
-  end
+#  it "should call select_from_table with select array" do
+#    sel_arr = ['name','industry']
+#    @res = ::Rho::RHO.get_user_db().select_from_table(Account.get_values_table_name(), '*', {'object' => '44e804f2-4933-4e20-271c-48fcecd9450d'}, nil, sel_arr)
+#    @res.length.should == 2
+#  end
   
   def verify_reset
-    Rhom::RhomDbAdapter::select_from_table('object_values','*').length.should == 0
-    res = Rhom::RhomDbAdapter::select_from_table('client_info','*')
+    ::Rho::RHO.get_user_db().select_from_table('object_values','*').length.should == 0
+    res = ::Rho::RHO.get_user_db().select_from_table('client_info','*')
     res.length.should == 1
     res[0]['reset'].should == 1
     res[0]['client_id'].should == CLIENT_ID
     
-    Rhom::RhomDbAdapter::select_from_table('sources','*').each do |source|
+    ::Rho::RHO.get_user_db().select_from_table('sources','*').each do |source|
       source['token'].should == 0
     end
     Rhom::Rhom::client_id.should == CLIENT_ID

data/spec/framework_spec/app/spec/spec_helper.rb

@@ -8,12 +8,20 @@ describe "rhom initializer", :shared => true do
   end
 
   after(:each) do
-    Rhom::RhomDbAdapter.start_transaction
+    ::Rho::RHO.get_user_db().start_transaction
     #Rhom::RhomAttribManager.reset_all
-    Rhom::RhomDbAdapter.delete_all_from_table('client_info')
-    Rhom::RhomDbAdapter.delete_all_from_table('object_values')
-    Rhom::RhomDbAdapter.delete_all_from_table('changed_values')
-    Rhom::RhomDbAdapter.commit
+    ::Rho::RHO.get_user_db().delete_all_from_table('client_info')
+    ::Rho::RHO.get_user_db().delete_all_from_table('object_values')
+    ::Rho::RHO.get_user_db().delete_all_from_table('changed_values')
+    begin
+        ::Rho::RHO.get_user_db().delete_all_from_table('Account')
+    rescue Exception => e
+    end    
+    
+    ::Rho::RHO.get_user_db().commit
+    
+    #::Rho::RHO.get_user_db().destroy_tables(:exclude => ['sources'])    
+    #::Rho::RHO.init_schema_sources  
   end
 end
 

data/spec/framework_spec/app/spec_runner.rb

@@ -22,11 +22,11 @@ class SpecRunner < MSpecScript
       config[:files] << 'spec/rho_spec'
       config[:files] << 'spec/spec_helper'
       config[:files] << 'spec/webview_spec'
-      config[:files] << 'spec/syncengine_spec'
+      #config[:files] << 'spec/syncengine_spec'
       config[:files] << 'spec/rhom_db_adapter_spec'
       config[:files] << 'spec/rhoerror_spec'
       config[:files] << 'spec/bsearch_spec'
-  
+=begin  
       # CORE, not including thread or fiber
       [
         "argf","class","exception","float","marshal","numeric","range","systemexit",
@@ -52,8 +52,9 @@ class SpecRunner < MSpecScript
           file.gsub!(/\.iseq/,"")
           config[:files] << file
         }
+=end        
     end
-  
+=begin  
     #    config[:files] << 'spec/find_spec'  # find not available on the device
 
     #LIBRARIES
@@ -63,7 +64,7 @@ class SpecRunner < MSpecScript
       file.gsub!(/\.iseq/,"")
       config[:files] << file
     }
-
+=end
   end
 
   def run

data/spec/framework_spec/public/css/base.css

@@ -20,7 +20,6 @@ li.overview div {
 	position: relative;
 	height:84px;
 	border-bottom: 1px solid #999999;
-  -webkit-border-radius: 0;
 }
 textarea {
   font-size: 16px;

data/spec/framework_spec/public/css/iphone.css

@@ -261,7 +261,6 @@ body > .panel {
     position: relative;
     min-height: 42px;
     border-bottom: 1px solid #999999;
-    -webkit-border-radius: 0;
     text-align: right;
 }
 

data/spec/framework_spec/rhoconfig.txt

@@ -21,4 +21,6 @@ LastVisitedPage = ''
 arbitrary_option = 'rhodes rocks!'
 sync_poll_interval=0
 #syncserver = 'http://192.168.0.185:9292/apps/framework_spec/sources'
-syncserver = 'http://dev.rhosync.rhohub.com/apps/Store/sources/'
+#syncserver = 'http://dev.rhosync.rhohub.com/apps/Store/sources/'
+#syncserver = 'http://rhosyncnew.staging.rhohub.com/apps/store_server'
+syncserver = 'http://rhosyncnew.staging.rhohub.com/application'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
-  - 1
-  - 5
-  - 5
-  version: 1.5.5
+  - 2
+  - 0
+  - 0
+  - beta1
+  version: 2.0.0.beta1
 platform: ruby
 authors: 
 - Rhomobile
@@ -144,11 +145,14 @@ files:
 - lib/extensions/digest/ext/depend
 - lib/extensions/digest/ext/digest.c
 - lib/extensions/digest/ext/digest.h
+- lib/extensions/digest/ext/digest.vcproj
 - lib/extensions/digest/ext/extconf.rb
 - lib/extensions/digest/ext/Rakefile
 - lib/extensions/digest/ext/test.sh
 - lib/extensions/digest/ext.yml
 - lib/extensions/digest-md5/ext/build
+- lib/extensions/digest-md5/ext/build.bat
+- lib/extensions/digest-md5/ext/digest-md5.vcproj
 - lib/extensions/digest-md5/ext/md5.c
 - lib/extensions/digest-md5/ext/md5.h
 - lib/extensions/digest-md5/ext/md5init.c
@@ -339,6 +343,7 @@ files:
 - platform/android/Rhodes/AndroidManifest.xml
 - platform/android/Rhodes/gen/com/rhomobile/rhodes/R.java
 - platform/android/Rhodes/jni/include/details/rhojava.inc
+- platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_alert_Alert.h
 - platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_camera_Camera.h
 - platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_datetime_DateTimePicker.h
 - platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_geolocation_GeoLocationImpl.h
@@ -346,6 +351,7 @@ files:
 - platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_RhoConf.h
 - platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_Rhodes.h
 - platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_RhoLogConf.h
+- platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_RhoMenu.h
 - platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_socket_RhoSocketImpl.h
 - platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_socket_SSLImpl.h
 - platform/android/Rhodes/jni/include/jni/com_rhomobile_rhodes_SplashScreen.h
@@ -361,7 +367,9 @@ files:
 - platform/android/Rhodes/jni/src/logconf.cpp
 - platform/android/Rhodes/jni/src/logger.cpp
 - platform/android/Rhodes/jni/src/mapview.cpp
+- platform/android/Rhodes/jni/src/menu.cpp
 - platform/android/Rhodes/jni/src/nativebar.cpp
+- platform/android/Rhodes/jni/src/navbar.cpp
 - platform/android/Rhodes/jni/src/phonebook.cpp
 - platform/android/Rhodes/jni/src/RhoClassFactory.cpp
 - platform/android/Rhodes/jni/src/rhoconf.cpp
@@ -372,7 +380,11 @@ files:
 - platform/android/Rhodes/jni/src/sslimpl.cpp
 - platform/android/Rhodes/jni/src/syncengine.cpp
 - platform/android/Rhodes/jni/src/webview.cpp
+- platform/android/Rhodes/res/drawable/alert_alert.png
+- platform/android/Rhodes/res/drawable/alert_info.png
+- platform/android/Rhodes/res/drawable/alert_question.png
 - platform/android/Rhodes/res/drawable/back.png
+- platform/android/Rhodes/res/drawable/camera.png
 - platform/android/Rhodes/res/drawable/exit.png
 - platform/android/Rhodes/res/drawable/home.png
 - platform/android/Rhodes/res/drawable/icon.png
@@ -398,6 +410,7 @@ files:
 - platform/android/Rhodes/src/com/rhomobile/rhodes/camera/FileList.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCaptureCallback.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/Capabilities.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePickerScreen.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java
@@ -420,6 +433,7 @@ files:
 - platform/android/Rhodes/src/com/rhomobile/rhodes/Rhodes.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesInstance.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/RhoLogConf.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSockAddr.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocket.java
@@ -432,6 +446,7 @@ files:
 - platform/android/Rhodes/src/com/rhomobile/rhodes/uri/MailUriHandler.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/uri/TelUriHandler.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/uri/UriHandler.java
+- platform/android/Rhodes/src/com/rhomobile/rhodes/uri/VideoUriHandler.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java
 - platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java
 - platform/bb/build/bb.rake
@@ -453,10 +468,7 @@ files:
 - platform/bb/Hsqldb/src/com/rho/db/HsqlDBRowResult.java
 - platform/bb/Hsqldb/src/com/rho/db/HsqlDBStorage.java
 - platform/bb/Hsqldb/src/com/rho/db/Journal.java
-- platform/bb/Hsqldb/src/com/rho/db/RandomAccessFile.java
 - platform/bb/Hsqldb/src/com/rho/file/FileAccessBB.java
-- platform/bb/Hsqldb/src/com/rho/file/Jsr75RAFileImpl.java
-- platform/bb/Hsqldb/src/com/rho/file/PersistRAFileImpl.java
 - platform/bb/Hsqldb/src/j2me/io/BufferedOutputStream.java
 - platform/bb/Hsqldb/src/j2me/io/FilterOutputStream.java
 - platform/bb/Hsqldb/src/j2me/math/BigDecimal.java
@@ -609,15 +621,22 @@ files:
 - platform/bb/rhodes/platform/4.2.1/com/rho/BBVersionSpecific.java
 - platform/bb/rhodes/platform/4.2.2/com/rho/BBVersionSpecific.java
 - platform/bb/rhodes/platform/4.7/com/rho/RhoMainScreen.java
+- platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java
 - platform/bb/rhodes/platform/5.0/com/rho/RhoMainScreen.java
 - platform/bb/rhodes/platform/common/com/rho/BBVersionSpecific.java
+- platform/bb/rhodes/platform/common/com/rho/BrowserAdapter5.java
 - platform/bb/rhodes/platform/common/com/rho/RhoMainScreen.java
 - platform/bb/rhodes/resources/icon.png
 - platform/bb/rhodes/rhodes.csl
 - platform/bb/rhodes/rhodes.cso
 - platform/bb/rhodes/rhodes.jdp
 - platform/bb/rhodes/src/com/rho/BBVersionSpecific.java
-- platform/bb/rhodes/src/com/rho/Jsr75File.java
+- platform/bb/rhodes/src/com/rho/BrowserAdapter.java
+- platform/bb/rhodes/src/com/rho/BrowserAdapter5.java
+- platform/bb/rhodes/src/com/rho/file/Jsr75File.java
+- platform/bb/rhodes/src/com/rho/file/Jsr75RAFileImpl.java
+- platform/bb/rhodes/src/com/rho/file/PersistRAFileImpl.java
+- platform/bb/rhodes/src/com/rho/IBrowserAdapter.java
 - platform/bb/rhodes/src/com/rho/net/BaseSocket.java
 - platform/bb/rhodes/src/com/rho/net/bb/BBHttpConnection.java
 - platform/bb/rhodes/src/com/rho/net/bb/NativeBBHttpConnection.java
@@ -629,6 +648,7 @@ files:
 - platform/bb/rhodes/src/com/rho/rubyext/Alert.java
 - platform/bb/rhodes/src/com/rho/rubyext/GeoLocation.java
 - platform/bb/rhodes/src/com/rho/rubyext/System.java
+- platform/bb/rhodes/src/com/rho/rubyext/WebView.java
 - platform/bb/rhodes/src/com/rho/rubyext/XMLParser.java
 - platform/bb/rhodes/src/com/rho/Version.java
 - platform/bb/rhodes/src/rhomobile/camera/Camera.java
@@ -653,7 +673,6 @@ files:
 - platform/bb/rhodes/src/rhomobile/RingtoneManager.java
 - platform/bb/rhodes/src/rhomobile/SecondaryResourceFetchThread.java
 - platform/bb/rhodes/src/rhomobile/Utilities.java
-- platform/bb/rhodes/src/rhomobile/WebView.java
 - platform/bb/RubyVM/RubyVM.cso
 - platform/bb/RubyVM/RubyVM.jdp
 - platform/iphone/back_btn.png
@@ -662,20 +681,18 @@ files:
 - platform/iphone/Classes/AppManager/AppManager.h
 - platform/iphone/Classes/AppManager/AppManager.m
 - platform/iphone/Classes/AppManager/AppManagerI.h
-- platform/iphone/Classes/BarItem.h
-- platform/iphone/Classes/BarItem.m
 - platform/iphone/Classes/Camera/PickImageDelegate.h
 - platform/iphone/Classes/Camera/PickImageDelegate.m
 - platform/iphone/Classes/DateTime.h
 - platform/iphone/Classes/DateTime.m
+- platform/iphone/Classes/DateTimePicker.h
+- platform/iphone/Classes/DateTimePicker.m
 - platform/iphone/Classes/DateTimePickerDelegate.h
 - platform/iphone/Classes/DateTimePickerDelegate.m
 - platform/iphone/Classes/Dispatcher/Dispatcher.c
 - platform/iphone/Classes/Dispatcher/Dispatcher.h
 - platform/iphone/Classes/GeoLocation/LocationController.h
 - platform/iphone/Classes/GeoLocation/LocationController.m
-- platform/iphone/Classes/JSString.h
-- platform/iphone/Classes/JSString.m
 - platform/iphone/Classes/LogOptionsController.h
 - platform/iphone/Classes/LogOptionsController.m
 - platform/iphone/Classes/LogViewController.h
@@ -688,6 +705,8 @@ files:
 - platform/iphone/Classes/MapView/MapViewController.m
 - platform/iphone/Classes/NativeBar.h
 - platform/iphone/Classes/NativeBar.m
+- platform/iphone/Classes/NavBar.h
+- platform/iphone/Classes/NavBar.m
 - platform/iphone/Classes/Phonebook/phonebook.h
 - platform/iphone/Classes/Phonebook/phonebook.m
 - platform/iphone/Classes/rho/common/RhoClassFactory.cpp
@@ -698,25 +717,25 @@ files:
 - platform/iphone/Classes/rho/net/NetRequestImpl.m
 - platform/iphone/Classes/rho/net/sslimpl.cpp
 - platform/iphone/Classes/rho/net/sslimpl.h
+- platform/iphone/Classes/RhoAlert.h
+- platform/iphone/Classes/RhoAlert.m
 - platform/iphone/Classes/RhoDelegate.h
 - platform/iphone/Classes/RhoDelegate.m
+- platform/iphone/Classes/Rhodes.h
+- platform/iphone/Classes/Rhodes.m
 - platform/iphone/Classes/RhoFileImpl.m
-- platform/iphone/Classes/RhoRunnerAppDelegate.h
-- platform/iphone/Classes/RhoRunnerAppDelegate.m
-- platform/iphone/Classes/Server/ServerHost.h
-- platform/iphone/Classes/Server/ServerHost.m
-- platform/iphone/Classes/Server/WebViewUrl.h
-- platform/iphone/Classes/Server/WebViewUrl.m
+- platform/iphone/Classes/RhoMainView.h
+- platform/iphone/Classes/RingtoneManager.h
+- platform/iphone/Classes/RingtoneManager.m
+- platform/iphone/Classes/SimpleMainView.h
+- platform/iphone/Classes/SimpleMainView.m
 - platform/iphone/Classes/SplashViewController.h
 - platform/iphone/Classes/SplashViewController.m
-- platform/iphone/Classes/TabBarDelegate.h
-- platform/iphone/Classes/TabBarDelegate.m
+- platform/iphone/Classes/TabbedMainView.h
+- platform/iphone/Classes/TabbedMainView.m
 - platform/iphone/Classes/Utils/ParamsWrapper.h
 - platform/iphone/Classes/Utils/ParamsWrapper.m
-- platform/iphone/Classes/Utils/unzip.cpp
-- platform/iphone/Classes/Utils/unzip.h
-- platform/iphone/Classes/WebViewController.h
-- platform/iphone/Classes/WebViewController.m
+- platform/iphone/Classes/WebView.m
 - platform/iphone/curl/curl.xcodeproj/project.pbxproj
 - platform/iphone/Entitlements.plist
 - platform/iphone/forward_btn.png
@@ -849,6 +868,8 @@ files:
 - platform/osx/Rhodes Launcher/rhorunner.app/Settings.bundle/Root.plist
 - platform/osx/Rhodes Launcher/unzipbundle.rb
 - platform/osx/Rhodes Launcher/version.plist
+- platform/shared/common/AppMenu.cpp
+- platform/shared/common/AppMenu.h
 - platform/shared/common/AutoPointer.h
 - platform/shared/common/InputStream.h
 - platform/shared/common/IRhoBrowser.h
@@ -1280,6 +1301,8 @@ files:
 - platform/shared/ruby/ext/mapview/mapview_wrap.c
 - platform/shared/ruby/ext/nativebar/nativebar.i
 - platform/shared/ruby/ext/nativebar/nativebar_wrap.c
+- platform/shared/ruby/ext/navbar/navbar.i
+- platform/shared/ruby/ext/navbar/navbar_wrap.c
 - platform/shared/ruby/ext/phonebook/phonebook.h
 - platform/shared/ruby/ext/phonebook/phonebook.i
 - platform/shared/ruby/ext/phonebook/phonebook_wrap.c
@@ -1488,7 +1511,10 @@ files:
 - platform/shared/ruby/wince/winsock2.c
 - platform/shared/rubyext/GeoLocation.cpp
 - platform/shared/rubyext/GeoLocation.h
+- platform/shared/rubyext/RhoRuby.cpp
+- platform/shared/rubyext/RhoRuby.h
 - platform/shared/rubyext/System.cpp
+- platform/shared/rubyext/WebView.h
 - platform/shared/rubyJVM/src/com/rho/Convert.java
 - platform/shared/rubyJVM/src/com/rho/DateTimeTokenizer.java
 - platform/shared/rubyJVM/src/com/rho/db/DBAdapter.java
@@ -1497,10 +1523,12 @@ files:
 - platform/shared/rubyJVM/src/com/rho/db/IDBCallback.java
 - platform/shared/rubyJVM/src/com/rho/db/IDBResult.java
 - platform/shared/rubyJVM/src/com/rho/db/IDBStorage.java
+- platform/shared/rubyJVM/src/com/rho/file/IFile.java
+- platform/shared/rubyJVM/src/com/rho/file/IFileAccess.java
+- platform/shared/rubyJVM/src/com/rho/file/IRAFile.java
+- platform/shared/rubyJVM/src/com/rho/file/RandomAccessFile.java
+- platform/shared/rubyJVM/src/com/rho/file/SimpleFile.java
 - platform/shared/rubyJVM/src/com/rho/FilePath.java
-- platform/shared/rubyJVM/src/com/rho/IFile.java
-- platform/shared/rubyJVM/src/com/rho/IFileAccess.java
-- platform/shared/rubyJVM/src/com/rho/IRAFile.java
 - platform/shared/rubyJVM/src/com/rho/IRhoLogSink.java
 - platform/shared/rubyJVM/src/com/rho/IRhoRubyHelper.java
 - platform/shared/rubyJVM/src/com/rho/Mutex.java
@@ -1525,16 +1553,18 @@ files:
 - platform/shared/rubyJVM/src/com/rho/RhoRuby.java
 - platform/shared/rubyJVM/src/com/rho/RhoThread.java
 - platform/shared/rubyJVM/src/com/rho/rjson/RJSONTokener.java
-- platform/shared/rubyJVM/src/com/rho/SimpleFile.java
 - platform/shared/rubyJVM/src/com/rho/SplashScreen.java
 - platform/shared/rubyJVM/src/com/rho/Sprintf.java
 - platform/shared/rubyJVM/src/com/rho/StringScanner.java
 - platform/shared/rubyJVM/src/com/rho/sync/ClientRegister.java
+- platform/shared/rubyJVM/src/com/rho/sync/ISyncProtocol.java
 - platform/shared/rubyJVM/src/com/rho/sync/ISyncStatusListener.java
 - platform/shared/rubyJVM/src/com/rho/sync/JSONArrayIterator.java
 - platform/shared/rubyJVM/src/com/rho/sync/JSONEntry.java
+- platform/shared/rubyJVM/src/com/rho/sync/JSONStructIterator.java
 - platform/shared/rubyJVM/src/com/rho/sync/SyncEngine.java
 - platform/shared/rubyJVM/src/com/rho/sync/SyncNotify.java
+- platform/shared/rubyJVM/src/com/rho/sync/SyncProtocol_3.java
 - platform/shared/rubyJVM/src/com/rho/sync/SyncSource.java
 - platform/shared/rubyJVM/src/com/rho/sync/SyncThread.java
 - platform/shared/rubyJVM/src/com/rho/TestProfiler.java
@@ -2825,10 +2855,12 @@ files:
 - platform/shared/stlport/test/unit/wctype_header_test.c
 - platform/shared/sync/ClientRegister.cpp
 - platform/shared/sync/ClientRegister.h
+- platform/shared/sync/ISyncProtocol.h
 - platform/shared/sync/SyncEngine.cpp
 - platform/shared/sync/SyncEngine.h
 - platform/shared/sync/SyncNotify.cpp
 - platform/shared/sync/SyncNotify.h
+- platform/shared/sync/SyncProtocol_3.h
 - platform/shared/sync/SyncSource.cpp
 - platform/shared/sync/SyncSource.h
 - platform/shared/sync/SyncThread.cpp
@@ -3320,8 +3352,8 @@ files:
 - platform/wm/rhodes/atlutil.h
 - platform/wm/rhodes/camera/Camera.cpp
 - platform/wm/rhodes/camera/Camera.h
-- platform/wm/rhodes/GetURLDialog.cpp
-- platform/wm/rhodes/GetURLDialog.h
+- platform/wm/rhodes/DateTimePicker.cpp
+- platform/wm/rhodes/DateTimePicker.h
 - platform/wm/rhodes/LogOptionsDlg.cpp
 - platform/wm/rhodes/LogOptionsDlg.h
 - platform/wm/rhodes/LogView.cpp
@@ -3349,6 +3381,7 @@ files:
 - platform/wm/rhodes/rho/rubyext/GeoLocationImpl.cpp
 - platform/wm/rhodes/rho/rubyext/GeoLocationImpl.h
 - platform/wm/rhodes/rho/rubyext/SystemImpl.cpp
+- platform/wm/rhodes/rho/rubyext/WebView.cpp
 - platform/wm/rhodes/Rhodes.cpp
 - platform/wm/rhodes/Rhodes.rc
 - platform/wm/rhodes/rhodes.vcproj
@@ -3356,6 +3389,8 @@ files:
 - platform/wm/rhodes/RingtoneManager.h
 - platform/wm/rhodes/stdafx.cpp
 - platform/wm/rhodes/stdafx.h
+- platform/wm/rhodes/Utils.cpp
+- platform/wm/rhodes/Utils.h
 - platform/wm/rhodes/Vibrate.cpp
 - platform/wm/rhodes/Vibrate.h
 - platform/wm/rhodes.sln
@@ -3370,6 +3405,20 @@ files:
 - platform/wm/tcmalloc/tcmalloc.vcproj
 - platform/wm/Tests/Tests.sln
 - platform/wm/Tests/Tests.vcproj
+- platform/wm/tools/detool/DEMComInterface.tlb
+- platform/wm/tools/detool/detool.cpp
+- platform/wm/tools/detool/detool.h
+- platform/wm/tools/detool/detool.vcproj
+- platform/wm/tools/detool/ReadMe.txt
+- platform/wm/tools/detool/stdafx.cpp
+- platform/wm/tools/detool/stdafx.h
+- platform/wm/tools/detool/targetver.h
+- platform/wm/tools/detool.sln
+- platform/wm/tools/rhosetup/ReadMe.txt
+- platform/wm/tools/rhosetup/rhosetup.cpp
+- platform/wm/tools/rhosetup/rhosetup.vcproj
+- platform/wm/tools/rhosetup/stdafx.cpp
+- platform/wm/tools/rhosetup/stdafx.h
 - Rakefile
 - rakefile.rb
 - README.textile
@@ -3378,40 +3427,171 @@ files:
 - res/build-tools/cygz.dll
 - res/build-tools/db/syncdb.schema
 - res/build-tools/db/syncdb.triggers
+- res/build-tools/detool.exe
 - res/build-tools/insertRhoBundle2pkg.rb
 - res/build-tools/make.exe
 - res/build-tools/rhodes_pid.key
 - res/build-tools/RhoRuby.exe
+- res/build-tools/rhosetup.dll
 - res/build-tools/rubylinux
 - res/build-tools/RubyMac
 - res/build-tools/xruby-0.3.3.jar
 - res/generators/rhogen.rb
 - res/generators/templates/application/app/application.rb
 - res/generators/templates/application/app/helpers/application_helper.rb
+- res/generators/templates/application/app/helpers/browser_helper.rb
+- res/generators/templates/application/app/index.bb.erb
 - res/generators/templates/application/app/index.erb
 - res/generators/templates/application/app/layout.erb
 - res/generators/templates/application/app/loading.html
 - res/generators/templates/application/app/Settings/controller.rb
+- res/generators/templates/application/app/Settings/home.bb.erb
 - res/generators/templates/application/app/Settings/home.erb
+- res/generators/templates/application/app/Settings/index.bb.erb
 - res/generators/templates/application/app/Settings/index.erb
+- res/generators/templates/application/app/Settings/login.bb.erb
 - res/generators/templates/application/app/Settings/login.erb
+- res/generators/templates/application/app/Settings/reset.bb.erb
 - res/generators/templates/application/app/Settings/reset.erb
+- res/generators/templates/application/app/Settings/wait.bb.erb
 - res/generators/templates/application/app/Settings/wait.erb
 - res/generators/templates/application/build.yml
 - res/generators/templates/application/icon/icon.ico
 - res/generators/templates/application/icon/icon.png
-- res/generators/templates/application/public/css/base.css
+- res/generators/templates/application/public/css/android.css
 - res/generators/templates/application/public/css/blackberry.css
 - res/generators/templates/application/public/css/iphone.css
-- res/generators/templates/application/public/css/rho.css
-- res/generators/templates/application/public/css/xhtml.css
+- res/generators/templates/application/public/css/webkit.css
+- res/generators/templates/application/public/css/windows_mobile.css
+- res/generators/templates/application/public/icons/about.png
+- res/generators/templates/application/public/icons/airplane.png
+- res/generators/templates/application/public/icons/baby.png
+- res/generators/templates/application/public/icons/badge.png
+- res/generators/templates/application/public/icons/bandaid.png
+- res/generators/templates/application/public/icons/bar-chart.png
+- res/generators/templates/application/public/icons/battery.png
+- res/generators/templates/application/public/icons/beaker.png
+- res/generators/templates/application/public/icons/beaker2.png
+- res/generators/templates/application/public/icons/beermug.png
+- res/generators/templates/application/public/icons/bird.png
+- res/generators/templates/application/public/icons/book.png
+- res/generators/templates/application/public/icons/bookmark.png
+- res/generators/templates/application/public/icons/brightness.png
+- res/generators/templates/application/public/icons/bug.png
+- res/generators/templates/application/public/icons/cabinet.png
+- res/generators/templates/application/public/icons/calendar.png
+- res/generators/templates/application/public/icons/camera.png
+- res/generators/templates/application/public/icons/changeName.rb
+- res/generators/templates/application/public/icons/chat2.png
+- res/generators/templates/application/public/icons/chicken.png
+- res/generators/templates/application/public/icons/clock.png
+- res/generators/templates/application/public/icons/cloud.png
+- res/generators/templates/application/public/icons/coffee.png
+- res/generators/templates/application/public/icons/compass.png
+- res/generators/templates/application/public/icons/contrast.png
+- res/generators/templates/application/public/icons/dashboard.png
+- res/generators/templates/application/public/icons/display.png
+- res/generators/templates/application/public/icons/dogpaw.png
+- res/generators/templates/application/public/icons/download.png
+- res/generators/templates/application/public/icons/dumbbell.png
+- res/generators/templates/application/public/icons/ekg.png
+- res/generators/templates/application/public/icons/envelope.png
+- res/generators/templates/application/public/icons/equalizer.png
+- res/generators/templates/application/public/icons/eye.png
+- res/generators/templates/application/public/icons/film-roll.png
+- res/generators/templates/application/public/icons/flag.png
+- res/generators/templates/application/public/icons/fork-and-knife.png
+- res/generators/templates/application/public/icons/fuel.png
+- res/generators/templates/application/public/icons/gameplan.png
+- res/generators/templates/application/public/icons/gear.png
+- res/generators/templates/application/public/icons/gear2.png
+- res/generators/templates/application/public/icons/gift.png
+- res/generators/templates/application/public/icons/heart.png
+- res/generators/templates/application/public/icons/house.png
+- res/generators/templates/application/public/icons/inbox.png
+- res/generators/templates/application/public/icons/index-cards.png
+- res/generators/templates/application/public/icons/iphone.png
+- res/generators/templates/application/public/icons/ipod.png
+- res/generators/templates/application/public/icons/key.png
+- res/generators/templates/application/public/icons/lifebuoy.png
+- res/generators/templates/application/public/icons/lightbulb.png
+- res/generators/templates/application/public/icons/line-chart.png
+- res/generators/templates/application/public/icons/location.png
+- res/generators/templates/application/public/icons/lock.png
+- res/generators/templates/application/public/icons/loopback.png
+- res/generators/templates/application/public/icons/magnifying-glass.png
+- res/generators/templates/application/public/icons/map-marker.png
+- res/generators/templates/application/public/icons/map.png
+- res/generators/templates/application/public/icons/medical-bag.png
+- res/generators/templates/application/public/icons/medical.png
+- res/generators/templates/application/public/icons/microphone.png
+- res/generators/templates/application/public/icons/movie1.png
+- res/generators/templates/application/public/icons/movie2.png
+- res/generators/templates/application/public/icons/network.png
+- res/generators/templates/application/public/icons/note.png
+- res/generators/templates/application/public/icons/outlet.png
+- res/generators/templates/application/public/icons/palette.png
+- res/generators/templates/application/public/icons/paperclip.png
+- res/generators/templates/application/public/icons/phone.png
+- res/generators/templates/application/public/icons/photos.png
+- res/generators/templates/application/public/icons/piano.png
+- res/generators/templates/application/public/icons/picture-frame.png
+- res/generators/templates/application/public/icons/pill.png
+- res/generators/templates/application/public/icons/pin.png
+- res/generators/templates/application/public/icons/pinetree.png
+- res/generators/templates/application/public/icons/planet.png
+- res/generators/templates/application/public/icons/puzzle.png
+- res/generators/templates/application/public/icons/radar.png
+- res/generators/templates/application/public/icons/Read me first - license.txt
+- res/generators/templates/application/public/icons/redo.png
+- res/generators/templates/application/public/icons/refresh.png
+- res/generators/templates/application/public/icons/runner.png
+- res/generators/templates/application/public/icons/shoebox.png
+- res/generators/templates/application/public/icons/shopping-bag.png
+- res/generators/templates/application/public/icons/shopping-cart.png
+- res/generators/templates/application/public/icons/shuffle.png
+- res/generators/templates/application/public/icons/signpost.png
+- res/generators/templates/application/public/icons/skull-n-crossbones.png
+- res/generators/templates/application/public/icons/skull.png
+- res/generators/templates/application/public/icons/sliders.png
+- res/generators/templates/application/public/icons/spraycan.png
+- res/generators/templates/application/public/icons/squiggle.png
+- res/generators/templates/application/public/icons/star.png
+- res/generators/templates/application/public/icons/stopwatch.png
+- res/generators/templates/application/public/icons/suitcase.png
+- res/generators/templates/application/public/icons/tag.png
+- res/generators/templates/application/public/icons/tags.png
+- res/generators/templates/application/public/icons/target.png
+- res/generators/templates/application/public/icons/testtube.png
+- res/generators/templates/application/public/icons/thermometer.png
+- res/generators/templates/application/public/icons/toolbox.png
+- res/generators/templates/application/public/icons/trophy.png
+- res/generators/templates/application/public/icons/tshirt.png
+- res/generators/templates/application/public/icons/tv.png
+- res/generators/templates/application/public/icons/umbrella.png
+- res/generators/templates/application/public/icons/walk.png
+- res/generators/templates/application/public/icons/weather.png
+- res/generators/templates/application/public/icons/widescreen.png
+- res/generators/templates/application/public/icons/wineglass.png
+- res/generators/templates/application/public/icons/zap.png
+- res/generators/templates/application/public/images/android/btn_check_off.png
+- res/generators/templates/application/public/images/android/btn_check_on.png
+- res/generators/templates/application/public/images/android/btn_radio_off.png
+- res/generators/templates/application/public/images/android/btn_radio_on.png
+- res/generators/templates/application/public/images/android/ic_menu_more.png
 - res/generators/templates/application/public/images/backButton.png
 - res/generators/templates/application/public/images/blueButton.png
 - res/generators/templates/application/public/images/cancel.png
 - res/generators/templates/application/public/images/grayButton.png
+- res/generators/templates/application/public/images/iphone/disclosure.png
+- res/generators/templates/application/public/images/iphone/disclosure_detail.png
+- res/generators/templates/application/public/images/iphone/radiobutton.png
+- res/generators/templates/application/public/images/iphone/select.png
+- res/generators/templates/application/public/images/iphone/switch.png
 - res/generators/templates/application/public/images/iui-logo-touch-icon.png
 - res/generators/templates/application/public/images/IUI_LICENSE.txt
 - res/generators/templates/application/public/images/listArrow.png
+- res/generators/templates/application/public/images/listArrowDown.png
 - res/generators/templates/application/public/images/listArrowSel.png
 - res/generators/templates/application/public/images/listGroup.png
 - res/generators/templates/application/public/images/loading.gif
@@ -3435,10 +3615,14 @@ files:
 - res/generators/templates/bundle/db/syncdb.sqlite
 - res/generators/templates/model/config.rb
 - res/generators/templates/model/controller.rb
+- res/generators/templates/model/edit.bb.erb
 - res/generators/templates/model/edit.erb
+- res/generators/templates/model/index.bb.erb
 - res/generators/templates/model/index.erb
 - res/generators/templates/model/model.rb
+- res/generators/templates/model/new.bb.erb
 - res/generators/templates/model/new.erb
+- res/generators/templates/model/show.bb.erb
 - res/generators/templates/model/show.erb
 - res/generators/templates/model/spec.rb
 - res/generators/templates/source/source_adapter.rb
@@ -3560,6 +3744,7 @@ files:
 - res/generators/templates/spec/app/spec_runner.rb
 - res/generators/templates/spec/app/SpecRunner/controller.rb
 - res/generators/templates/spec/app/SpecRunner/index.erb
+- rhobuild.yml
 - rhobuild.yml.example
 - rhodes.gemspec
 - spec/framework_spec/app/Account/config.rb
@@ -3685,7 +3870,6 @@ files:
 - spec/framework_spec/app/mspec.rb
 - spec/framework_spec/app/Product/config.rb
 - spec/framework_spec/app/Product/controller.rb
-- spec/framework_spec/app/Question/config.rb
 - spec/framework_spec/app/Settings/controller.rb
 - spec/framework_spec/app/Settings/index.erb
 - spec/framework_spec/app/spec/bsearch_spec.rb
@@ -5305,7 +5489,6 @@ files:
 - spec/generator_spec/generator_spec_helper.rb
 - spec/generator_spec/model_generator_spec.rb
 - spec/generator_spec/README
-- spec/generator_spec/source_generator_spec.rb
 - spec/generator_spec/spec.opts
 - spec/generator_spec/spec_helper.rb
 has_rdoc: true