Next step in upgrading Tracks to Rails 2.2. Some highlights:

* Ran rake rails:update
* Added old actionwebservice framework
* Updated RSpec and RSpec-Rails
* Removed asset_packager plugin (not compatible, Scott no longer maintaining), and replaced with bundle_fu. See the bundle_fu README for more info.
* Hacks to UJS and ARTS plugins, which are no longer supported. Probably should move off both UJS and RJS.
* Hack to flashobject_helper plugin (upgrade to Rails 2.2-compatible version if/when it comes out.)
* Hack to skinny-spec plugin, for Rails 2.2 compatibility. Should check for official release.
* Hacks to resource_feeder plugin, for Rails 2.2 compatibility. Should check for official release (not likely) or move off it.
* Addressed some deprecation warnings. More to come.
* My mobile mime type hackery is no longer necessary with new Rails features. Yay!
* Updated environment.rb.tmpl with changes

TODO:
* Restore view specs marked pending
* Fix failing integration tests.
* Try selenium tests.
* Investigate OpenID support.
* Address deprecation warnings.
* Consider moving parts of environment.rb to initializers
* Address annoying config.gem warning about highline gem

app/views/contexts/show.html.erb

@@ -8,5 +8,5 @@
 
 <div id="input_box">
   <%= render :partial => "shared/add_new_item_form" %>
-<%= render "sidebar/sidebar" %>
+  <%= render :template => "sidebar/sidebar" %>
 </div><!-- End of input box -->

app/views/feedlist/index.html.erb

@@ -123,7 +123,7 @@
 </div><!-- End of display_box -->
 
 <div id="input_box">
-  <%= render "sidebar/sidebar" %>
+  <%= render :template => "sidebar/sidebar" %>
 </div><!-- End of input box -->
 
 <script type="text/javascript">

app/views/layouts/standard.html.erb

@@ -5,9 +5,16 @@
     <% if @prefs.refresh != 0 -%>
       <meta http-equiv="Refresh" content="<%= @prefs["refresh"].to_i*60 %>;url=<%= request.request_uri %>">
     <% end -%>
-  <%= javascript_include_merged :tracks %>
+  <% bundle do %>
+    <%= javascript_include_tag *%w[
+                                    prototype effects dragdrop controls application
+                                    calendar calendar-en calendar-setup
+                                    accesskey-hints todo-items niftycube
+                                    protoload flashobject lowpro
+                                  ] %>
+    <%= stylesheet_link_tag *%w[ standard calendar-system niftyCorners] %>
+  <% end %>
   <%= javascript_include_tag :unobtrusive %>
-  <%= stylesheet_link_merged :tracks %>
   <%= stylesheet_link_tag "print", :media => "print" %>
   
   <link rel="shortcut icon" href="<%= url_for(:controller => 'favicon.ico') %>" />

app/views/projects/show.html.erb

@@ -74,5 +74,5 @@
 
 <div id="input_box">
   <%= render :partial => "shared/add_new_item_form" %>
-  <%= render "sidebar/sidebar" %>
+  <%= render :template => "sidebar/sidebar" %>
 </div><!-- End of input box -->

app/views/todos/index.html.erb

@@ -10,5 +10,5 @@
 
 <div id="input_box">
   <%= render :partial => "shared/add_new_item_form" %>
-  <%= render "sidebar/sidebar" %>
+  <%= render :template => "sidebar/sidebar" %>
 </div><!-- End of input box -->

app/views/todos/list_deferred.html.erb

@@ -11,5 +11,5 @@
 
 <div id="input_box">
   <%= render :partial => "shared/add_new_item_form" %>
-  <%= render "sidebar/sidebar" %>
+  <%= render :template => "sidebar/sidebar" %>
 </div><!-- End of input box -->

app/views/todos/tag.html.erb

@@ -23,5 +23,5 @@
 
 <div id="input_box">
   <%= render :partial => "shared/add_new_item_form" %>
-  <%= render "sidebar/sidebar" %>
+  <%= render :template => "sidebar/sidebar" %>
 </div><!-- End of input box -->