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/controllers/application.rb

@@ -32,13 +32,13 @@ class ApplicationController < ActionController::Base
   before_filter :set_time_zone
   prepend_before_filter :login_required
   prepend_before_filter :enable_mobile_content_negotiation
-  after_filter :restore_content_type_for_mobile
   after_filter :set_charset
   
 
 
   include ActionView::Helpers::TextHelper
   include ActionView::Helpers::SanitizeHelper
+  extend ActionView::Helpers::SanitizeHelper::ClassMethods
   helper_method :format_date, :markdown
 
   # By default, sets the charset to UTF-8 if it isn't already set
@@ -148,21 +148,15 @@ class ApplicationController < ActionController::Base
   # during the processing and then setting it to 'text/html' in an
   # 'after_filter' -LKM 2007-04-01
   def mobile?
-    return params[:format] == 'm' || response.content_type == MOBILE_CONTENT_TYPE
+    return params[:format] == 'm'
   end
 
   def enable_mobile_content_negotiation
     if mobile?
-      request.accepts.unshift(Mime::Type::lookup(MOBILE_CONTENT_TYPE))
+      request.format = :m
     end
   end
 
-  def restore_content_type_for_mobile
-    if mobile?
-      response.content_type = 'text/html'
-    end
-  end
-  
   def create_todo_from_recurring_todo(rt, date=nil)
     # create todo and initialize with data from recurring_todo rt
     todo = current_user.todos.build( { :description => rt.description, :notes => rt.notes, :project_id => rt.project_id, :context_id => rt.context_id})

app/controllers/todos_controller.rb

@@ -76,7 +76,7 @@ class TodosController < ApplicationController
       format.m do
         @return_path=cookies[:mobile_url]
         # todo: use function for this fixed path
-        @return_path='/mobile' if @return_path.nil?
+        @return_path='/m' if @return_path.nil?
         if @saved
           redirect_to @return_path
         else

app/models/message_gateway.rb

@@ -1,5 +1,7 @@
 class MessageGateway < ActionMailer::Base
   include ActionView::Helpers::SanitizeHelper
+  extend ActionView::Helpers::SanitizeHelper::ClassMethods
+  
   def receive(email)
     user = User.find(:first, :include => [:preference], :conditions => ["preferences.sms_email = ?", email.from[0].strip])
     if user.nil?

app/models/user.rb

@@ -188,7 +188,7 @@ class User < ActiveRecord::Base
   end
   
   def at_midnight(date)
-    return TimeZone[prefs.time_zone].local(date.year, date.month, date.day, 0, 0, 0)
+    return ActiveSupport::TimeZone[prefs.time_zone].local(date.year, date.month, date.day, 0, 0, 0)
   end
   
   def generate_token

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 -->